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
..
freestyle	Fix for the WithinImageBorderUP1D predicate not working with a ViewEdge such that	2012-05-28 23:53:28 +00:00
modules	code cleanup: python - pass multiple args to string startswith() / endswith() functions rather than calling multiple times.	2012-09-04 20:26:42 +00:00
presets	split off auto depth option to have cursor placement use depth too since you dont always want both.	2012-08-10 10:34:24 +00:00
startup	Merged changes in the trunk up to revision 50829.	2012-09-23 18:50:56 +00:00
templates	change templates to call modal_handler_add() is called last since any errors between calling this function and returning will crash blender. see [#30687]	2012-09-05 00:11:39 +00:00