Brecht Van Lommel 5216dd5fce Merge branch 'blender2.7'

2018-12-27 10:53:02 +01:00

..

app

Merge branch 'master' into blender2.8

2018-12-13 14:32:32 +01:00

blender

Fix/cleanup typos and such in UI messages (and some comments).

2018-12-24 15:03:49 +01:00

bvh

Cleanup: trailing space

2018-11-25 08:01:14 +11:00

cmake

Cycles: Added Embree as BVH option for CPU renders.

2018-11-07 12:58:12 +01:00

device

Merge branch 'master' into blender2.8

2018-12-07 15:00:48 +01:00

doc

Cleanup: strip trailing space for cycles

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

graph

Update code to be compatible with OIIO 2.0

2018-12-11 15:50:02 +01:00

kernel

Merge branch 'blender2.7'

2018-12-27 10:53:02 +01:00

render

Merge branch 'master' into blender2.8

2018-12-11 15:56:04 +01:00

subd

Cycles: Cleanup, space after (void)

2018-11-09 12:08:51 +01:00

test

Fix (unreported) building Cycles tests with Embree enabled.

2018-12-05 15:14:16 +01:00

util

Merge branch 'blender2.7'

2018-12-21 17:05:56 +01:00

CMakeLists.txt

Fix build with old CMake versions.

2018-12-05 12:53:19 +01:00