Bastien Montagne 562da211c2 Merge branch 'master' into blender2.8		2017-11-16 12:50:53 +01:00
..
app	Merge remote-tracking branch 'origin/master' into blender2.8	2017-11-13 11:48:48 -02:00
blender	Cycles: Fix after recent merge from master	2017-11-15 09:53:16 -02:00
bvh	Cycles: Fix wrong shading when some mesh triangle has non-finite coordinate	2017-10-18 12:19:53 +02:00
cmake	CMake: Add option to build against system-wide Glog	2017-04-21 14:36:34 +02:00
device	Merge remote-tracking branch 'origin/master' into blender2.8	2017-11-13 11:48:48 -02:00
doc	Cycles: relicense GNU GPL source code to Apache version 2.0.	2013-08-18 14:16:15 +00:00
graph	Cycles: Fix compilation error with latest OIIO	2017-11-10 10:04:33 +01:00
kernel	Cycles: Fix crash with split branched path tracing	2017-11-16 04:59:31 -05:00
render	Merge commit '212a8d9e5ae7' into blender2.8	2017-11-15 07:40:27 -02:00
subd	Cycles: Make all #include statements relative to cycles source directory	2017-03-29 13:41:11 +02:00
test	Fix Cycles gtests build on macOS.	2017-10-24 17:52:20 +02:00
util	Merge commit '212a8d9e5ae7^' into blender2.8	2017-11-15 07:07:27 -02:00
CMakeLists.txt	Cycles: Fix compilation error with OIIO compiled against system PugiXML	2017-11-13 10:42:29 +01:00