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
..
extern	defines to make it easier to manage ik stretch constants (these may need to be tweaked to fix [#32174])	2012-07-27 23:16:33 +00:00
intern	Merged changes in the trunk up to revision 50829.	2012-09-23 18:50:56 +00:00
test/ik_glut_test	unify include guard defines, __$FILENAME__	2012-02-17 18:59:41 +00:00
CMakeLists.txt	cmake option to build without iksolver	2012-08-18 13:36:29 +00:00
SConscript	cmake option to build without iksolver	2012-08-18 13:36:29 +00:00