Campbell Barton a2929edf28 Merge branch 'master' into blender2.8

2018-07-12 11:10:25 +02:00

..

app

Fix Cycles standalone build issue with OpenColorIO.

2018-07-10 17:48:48 +02:00

blender

Merge branch 'master' into blender2.8

2018-07-12 11:10:25 +02:00

bvh

Cleanup: strip trailing space for cycles

2018-07-06 10:17:58 +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-07-06 12:30:48 +02:00

doc

Cleanup: strip trailing space for cycles

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

graph

Cleanup: strip trailing space for cycles

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

kernel

Merge branch 'master' into blender2.8

2018-07-06 12:30:48 +02:00

render

Merge branch 'master' into blender2.8

2018-07-06 10:18:52 +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-07-06 10:18:52 +02:00

CMakeLists.txt

Cleanup: trailing newlines

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