griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
Files
d5a024c72d99ea35e8fa2b3b2f6e9f268d49b9aa
test2/intern/cycles
History
Julian Eisel 4041249943 Merge branch 'blender2.7' 
Conflicts:
	intern/cycles/blender/addon/properties.py
	intern/cycles/device/opencl/opencl_split.cpp
2019-03-09 17:19:52 +01:00
..
app
Merge branch 'blender2.7'
2019-03-05 19:14:00 +01:00
blender
Merge branch 'blender2.7'
2019-03-09 17:19:52 +01:00
bvh
Cleanup: fix compiler warnings.
2019-01-26 14:49:11 +01:00
cmake
Cycles: Added Embree as BVH option for CPU renders.
2018-11-07 12:58:12 +01:00
device
Merge branch 'blender2.7'
2019-03-09 17:19:52 +01:00
doc
Cleanup: strip trailing space for cycles
2018-07-06 10:17:58 +02:00
graph
Cleanup: add begin/end iterators to Cycles NodeEnum.
2019-01-14 15:57:53 +01:00
kernel
Merge branch 'blender2.7'
2019-03-09 17:19:52 +01:00
render
Merge branch 'blender2.7'
2019-03-05 19:14:00 +01:00
subd
Cleanup: remove redundant, invalid info from headers
2019-02-02 02:40:00 +11:00
test
Fix broken Cycles test build after recent commit.
2019-02-18 15:00:17 +01:00
util
Merge branch 'blender2.7'
2019-03-09 17:19:52 +01:00
CMakeLists.txt
Fix build with old CMake versions.
2018-12-05 12:53:19 +01:00