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
..
intern	Merged changes in the trunk up to revision 50829.	2012-09-23 18:50:56 +00:00
CMakeLists.txt	Add remesh modifier (dual contouring).	2011-12-30 21:11:40 +00:00
dualcon.h	Code style cleanup in intern/dualcon.	2012-05-08 22:11:05 +00:00
SConscript	Add remesh modifier (dual contouring).	2011-12-30 21:11:40 +00:00