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
..
app	Merged changes in the trunk up to revision 50829.	2012-09-23 18:50:56 +00:00
blender	Merged changes in the trunk up to revision 50829.	2012-09-23 18:50:56 +00:00
bvh	Merged changes in the trunk up to revision 50829.	2012-09-23 18:50:56 +00:00
cmake	Cleanup for OSL linking in cmake: Move cmake OSL library search and path definition from the cycles macro file to the top-level CMakeLists.txt. This makes the OSL_LIBRARIES and other variables accessible throughout Blender cmake scripts and especially in the creator module for linking libraries.	2012-09-10 06:18:20 +00:00
device	Merged changes in the trunk up to revision 50829.	2012-09-23 18:50:56 +00:00
doc	edits to cycles cmake files so cmake_consistency_check.py can parse them.	2011-11-08 20:27:37 +00:00
kernel	Merged changes in the trunk up to revision 50829.	2012-09-23 18:50:56 +00:00
render	Merged changes in the trunk up to revision 50829.	2012-09-23 18:50:56 +00:00
subd	Merged changes in the trunk up to revision 50829.	2012-09-23 18:50:56 +00:00
util	Merged changes in the trunk up to revision 50829.	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
SConscript	Fix for cycles building with assertions on scons/windows.	2012-06-25 11:42:58 +00:00