Sybren A. Stüvel 3bca9f5fed Merge branch 'master' into blender2.8 ...

# Conflicts:
#	source/blender/makesrna/intern/rna_render.c

2017-08-15 13:02:45 +02:00

..

app

CMake: Add option to build against system-wide Glog

2017-04-21 14:36:34 +02:00

blender

Merge branch 'master' into blender2.8

2017-08-15 13:02:45 +02:00

bvh

Cycles: Guard memcpy to potentially re-allocating memory with lock

2017-08-14 14:55:47 +02:00

cmake

CMake: Add option to build against system-wide Glog

2017-04-21 14:36:34 +02:00

device

Merge branch 'master' into blender2.8

2017-08-12 14:01:54 +02:00

doc

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

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

graph

Cycles: Make all #include statements relative to cycles source directory

2017-03-29 13:41:11 +02:00

kernel

Code cleanup: make L_transparent part of PathRadiance.

2017-08-13 01:19:07 +02:00

render

Merge branch 'master' into blender2.8

2017-08-15 13:02:45 +02:00

subd

Cycles: Make all #include statements relative to cycles source directory

2017-03-29 13:41:11 +02:00

test

Cycles: Don't leave multiple spaces in the device name

2017-06-08 12:15:24 +02:00

util

Merge branch 'master' into blender2.8

2017-08-14 12:13:55 +10:00

CMakeLists.txt

CMake: Add option to build against system-wide Glog

2017-04-21 14:36:34 +02:00