Brecht Van Lommel c3052f9126 Fix merge error, this should have been included from master.

2018-09-28 10:47:11 +02:00

..

app

Merge branch 'master' into blender2.8

2018-09-27 20:12:14 +02:00

blender

Cycles: keep material settings panel closed by default.

2018-09-21 13:56:22 +02:00

bvh

Cycles: Cleanup

2018-09-27 14:49:37 +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-19 18:42:17 +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-27 14:51:33 +02:00

render

Cleanup: fix harmless compiler warnings.

2018-09-27 15:33:44 +02:00

subd

Cleanup: strip trailing space for cycles

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

test

Build: require OpenJPEG 2.x minimum, remove bundled version.

2018-09-11 12:45:05 +02:00

util

Merge branch 'master' into blender2.8

2018-09-19 12:05:08 +10:00

CMakeLists.txt

Fix merge error, this should have been included from master.

2018-09-28 10:47:11 +02:00