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
cycles_server.cpp	Cycles: device code refactoring, no functional changes.	2012-01-04 18:06:32 +00:00
cycles_test.cpp	Cycles / Test:	2012-09-14 13:11:48 +00:00
cycles_xml.cpp	Cycles: merge of changes from tomato branch.	2012-09-04 13:29:07 +00:00
cycles_xml.h	Cycles render engine, initial commit. This is the engine itself, blender modifications and build instructions will follow later.	2011-04-27 11:58:34 +00:00
io_export_cycles_xml.py	Code Cleanup: check is / is not when comparing singletons.	2012-02-02 21:07:56 +00:00