Bastien Montagne 45f3150c98 Merge branch 'master' into blender2.8 ...

Conflicts:
	source/blender/editors/space_view3d/drawobject.c

2017-04-10 17:34:31 +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: Apparently board name could be an empty string

2017-04-10 15:31:21 +02: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: Workaround cubic volume filtering crashing on Linux

2017-04-10 14:44:07 +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/msvc] Get cycles_kernel compile time under control.

2017-04-07 10:26:55 -06:00

CMakeLists.txt

Fix T51051: Incorrect render on 32bit Linux

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