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
..
cpp	code cleanup: compile with clang and quiet some warnings.	2012-06-28 12:32:06 +00:00
intern	code cleanup: move file string defines into BLI_path_utils.h, BKE_utildefines is now unused but keep incase we want to add defines there later.	2012-09-03 22:04:14 +00:00
test/simpletest	Merged changes in the trunk up to revision 50829.	2012-09-23 18:50:56 +00:00
CMakeLists.txt	remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n	2011-10-23 17:52:20 +00:00
MEM_guardedalloc.h	code cleanup: vfont's used confusing and over complicated method of storing memory for loaded fonts, not store as a temp var in the fonts.	2012-08-21 10:39:02 +00:00
MEM_sys_types.h	First MinGW-w64 support for cmake has been added. To test I recommend this build:	2012-04-23 20:09:59 +00:00
mmap_win.h	unify include guard defines, __$FILENAME__	2012-02-17 18:59:41 +00:00
SConscript	Enable CXX_GUARDEDALLOC support through SCons.	2010-10-08 20:39:56 +00:00