Blender Git Commit Log
Git Commits -> Revision a42ba82
Revision a42ba82 by Tamito Kajiyama (master) September 23, 2012, 18:50 (GMT) |
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. |
Commit Details:
Full Hash: a42ba82f638e481d7fd3c3ed2ba05c331ef6717e
SVN Revision: 50832
Parent Commits: 7afbdff, a73dd34