Campbell Barton 15bab56fbc Merge branch 'master' into blender2.8

2018-09-11 11:02:37 +10:00

..

app

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

2018-09-04 17:00:44 -06:00

blender

Cleanup: remove unused field args

2018-09-10 14:05:33 +10:00

bvh

Fix T56612: crash in Cycles viewport render update, after recent changes.

2018-08-30 12:46:46 +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-09-03 15:33:07 +02:00

doc

Cleanup: strip trailing space for cycles

2018-07-06 10:17:58 +02:00

graph

Cycles: Cleanup, style

2018-08-24 14:36:18 +02:00

kernel

Merge branch 'master' into blender2.8

2018-09-11 11:02:37 +10:00

render

Merge branch 'master' into blender2.8

2018-09-06 20:11:18 +02:00

subd

Cleanup: strip trailing space for cycles

2018-07-06 10:17:58 +02:00

test

Fix Cycles tests build on macOS.

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

util

Merge branch 'master' into blender2.8

2018-08-30 17:40:06 +02:00

CMakeLists.txt

cmake: adjustments required for lib-upgrade on windows.

2018-08-27 19:38:31 -06:00