Blender Git Loki
Git Commits -> Revision 333e589
Revision 333e589 by Antonis Ryakiotakis (temp_viewport_fx_merge) May 11, 2015, 09:33 (GMT) |
Merge branch 'master' into temp_viewport_fx_merge Conflicts: source/blender/editors/gpencil/drawgpencil.c source/blender/editors/space_sequencer/sequencer_draw.c source/blender/editors/space_view3d/drawobject.c source/blender/editors/space_view3d/view3d_draw.c source/blender/editors/transform/transform.c |
Commit Details:
Full Hash: 333e58919c20c06a1a77584610633c690462b3a1
Parent Commits: 36f5dff, dfbb876