Blender Git Loki
Git Commits -> Revision 17ee056
Revision 17ee056 by Tamito Kajiyama (master) June 16, 2011, 05:50 (GMT) |
Merged changes in the trunk up to revision 37539. Conflicts resolved: source/blender/render/intern/source/pipeline.c Also fixed an inconsistent conflict resolution in the last commit with regard to release/scripts/startup/bl_ui/properties_render.py. This problem resulted in empty menus in the GUI. |
Commit Details:
Full Hash: 17ee056fc6d15abc4b69a24ceac0e7f3d4dffa47
SVN Revision: 37540
Parent Commits: 2e8ca6d, 32c7e22
Master Commits
MiikaH:n Sivut a.k.a. MiikaHweb | 2003-2021