sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity
a42ba82f63
blender/intern/cycles/device
History
Tamito Kajiyama a42ba82f63 Merged changes in the trunk up to revision 50829. 
Conflicts resolved:
source/blender/blenloader/intern/readfile.c
source/blender/render/intern/source/convertblender.c
source/blender/render/intern/source/pipeline.c

Also addressed code inconsistency due to changes in the trunk revision 50628 (color
management with OCIO) and 50806 (UV project material).  OCIO-related changes are marked
OCIO_TODO as in some other files modified in revision 50628.
2012-09-23 18:50:56 +00:00
..
CMakeLists.txt Merged changes in the trunk up to revision 50829. 2012-09-23 18:50:56 +00:00
device_cpu.cpp Merged changes in the trunk up to revision 50829. 2012-09-23 18:50:56 +00:00
device_cuda.cpp Merged changes in the trunk up to revision 50829. 2012-09-23 18:50:56 +00:00
device_intern.h Cycles: device code refactoring, no functional changes. 2012-01-04 18:06:32 +00:00
device_memory.h Cycles: device code refactoring, no functional changes. 2012-01-04 18:06:32 +00:00
device_multi.cpp Merged changes in the trunk up to revision 50829. 2012-09-23 18:50:56 +00:00
device_network.cpp Cycles: render passes for CUDA cards with compute model >= 2.x. 2012-01-26 19:07:01 +00:00
device_network.h style cleanup: block comments 2012-06-09 17:22:52 +00:00
device_opencl.cpp Merged changes in the trunk up to revision 50829. 2012-09-23 18:50:56 +00:00
device_task.cpp Cycles: merge of changes from tomato branch. 2012-09-04 13:29:07 +00:00
device_task.h Cycles: merge of changes from tomato branch. 2012-09-04 13:29:07 +00:00
device.cpp Cycles: merge of changes from tomato branch. 2012-09-04 13:29:07 +00:00
device.h Merged changes in the trunk up to revision 50829. 2012-09-23 18:50:56 +00:00