Campbell Barton 18d87e79e9 Merge branch 'master' into blender2.8

2018-06-29 09:25:40 +02:00

..

app

Merge remote-tracking branch 'origin/master' into blender2.8

2018-06-14 22:54:42 +02:00

blender

Merge branch 'master' into blender2.8

2018-06-29 09:25:40 +02:00

bvh

Cycles: Cleanup, silence strict compiler warning

2018-06-11 13:02:10 +02:00

cmake

Cycles: Query XYZ to/from Scene Linear conversion from OCIO instead of assuming sRGB

2018-06-14 22:21:37 +02:00

device

Merge branch 'master' into blender2.8

2018-06-26 17:42:33 +02:00

doc

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

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

graph

Cleanup: trailing newlines

2018-06-29 09:23:51 +02:00

kernel

Merge branch 'master' into blender2.8

2018-06-29 09:25:40 +02:00

render

Merge branch 'master' into blender2.8

2018-06-26 17:42:33 +02:00

subd

msvc: Use source folder structure for project file.

2018-02-03 16:38:27 -07:00

test

Fix Cycles tests build on macOS.

2018-06-28 00:11:01 +02:00

util

Merge branch 'master' into blender2.8

2018-06-26 17:42:33 +02:00

CMakeLists.txt

Cleanup: trailing newlines

2018-06-29 09:23:51 +02:00