Bastien Montagne 95b3632112 Merge branch 'master' into blender2.8 ...

Conflicts:
	source/blender/alembic/intern/abc_exporter.cc

2017-04-14 12:39:54 +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: Header cleanup in BVH: move self header to be the first one

2017-04-13 11:28:02 +02:00

cmake

Fix compilation error when CUDA toolkit is not installed

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

device

Cycles: Only calculate global size of split kernel once to avoid changes

2017-04-11 03:26:18 -04:00

doc

Cycles: relicense GNU GPL source code to Apache version 2.0.

2013-08-18 14:16:15 +00:00

graph

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

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

kernel

Cycles: Make vectorized types constructor from register explicit

2017-04-13 15:08:00 +02:00

render

Cycles: Fix race condition in shader attribute for real now

2017-04-10 16:53:01 +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: Make vectorized types constructor from register explicit

2017-04-13 15:08:00 +02:00

CMakeLists.txt

Fix T51051: Incorrect render on 32bit Linux

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