Sybren A. Stüvel 063bae4fcc Merge branch 'master' into blender2.8 ...

# Conflicts:
#	source/blender/alembic/intern/abc_exporter.h
#	source/blender/alembic/intern/abc_util.cc

2017-04-07 17:28:22 +02:00

..

app

Cycles: Fix compilation error of app after the include directories change

2017-03-29 16:54:41 +02:00

blender

Merge branch 'master' into blender2.8

2017-04-07 17:28:22 +02:00

bvh

Cycles: Cleanup, rename RegularBVH to BinaryBVH

2017-03-30 09:47:27 +02:00

cmake

Fix compilation error when CUDA toolkit is not installed

2016-11-07 14:47:10 +01:00

device

Cycles: Change work pool and global size of split CPU for easier debugging

2017-04-07 06:06:08 -04:00

doc

…

graph

Cycles: Make all #include statements relative to cycles source directory

2017-03-29 13:41:11 +02:00

kernel

Cycles: Change work pool and global size of split CPU for easier debugging

2017-04-07 06:06:08 -04:00

render

Cycles: Fix race condition in attributes creation during SVM compilation

2017-04-05 14:57:54 +02:00

subd

Cycles: Make all #include statements relative to cycles source directory

2017-03-29 13:41:11 +02:00

test

Cycles: Cleanup, order of arguments to EXPECT_EQ

2017-02-03 11:35:34 +01:00

util

Cycles: Add utility class to simplify scoped spin locks

2017-04-05 14:57:34 +02:00

CMakeLists.txt

Fix T51051: Incorrect render on 32bit Linux

2017-03-30 11:37:31 +02:00