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
..
binreloc	update gpl header in cmake files	2012-02-11 04:05:00 +00:00
bullet2	add missing files from cmakes lists	2012-09-05 00:52:35 +00:00
carve	fix for carve memory leak, update carve to hg bf36d92ff093	2012-07-04 16:07:01 +00:00
colamd	update gpl header in cmake files	2012-02-11 04:05:00 +00:00
Eigen3	Update Eigen3 library, would be needed for some further integraiton.	2012-05-09 08:33:05 +00:00
glew	update gpl header in cmake files	2012-02-11 04:05:00 +00:00
libmv	Merged changes in the trunk up to revision 50829.	2012-09-23 18:50:56 +00:00
libopenjpeg	add cmake option WITH_SYSTEM_OPENJPEG so linux can build cycles without having libopenjpeg installed.	2012-06-23 14:23:44 +00:00
libredcode	style cleanup	2012-05-27 00:36:50 +00:00
lzma	update gpl header in cmake files	2012-02-11 04:05:00 +00:00
lzo	update gpl header in cmake files	2012-02-11 04:05:00 +00:00
recastnavigation	style cleanup: also spelling	2012-08-24 23:22:34 +00:00
xdnd	Drag-n-drop support on Linux	2012-02-17 16:58:09 +00:00
CMakeLists.txt	Remove old boolean operation module	2012-08-02 16:42:30 +00:00
SConscript	Remove old boolean operation module	2012-08-02 16:42:30 +00:00