kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity
e8b6bcd65c
blender/intern/cycles
History
Bastien Montagne e8b6bcd65c Merge branch 'master' into blender2.8 
Conflicts:
	source/blender/depsgraph/intern/builder/deg_builder_relations.cc
	source/blender/editors/object/object_add.c
	source/blender/python/intern/bpy_app_handlers.c
2017-08-08 16:43:25 +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-07 16:16:43 +02:00
bvh Fix Cycles shadow catcher objects influencing each other. 2017-08-07 17:54:26 +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-08 16:43:25 +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 Cycles: Cleanup, de-duplicate function parameter list 2017-08-08 15:27:25 +02:00
render Merge branch 'master' into blender2.8 2017-08-08 16:43:25 +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-08 16:43:25 +02:00
CMakeLists.txt CMake: Add option to build against system-wide Glog 2017-04-21 14:36:34 +02:00