Blender Git Loki
Git Commits -> Revision 5467064
Revision 5467064 by Antonis Ryakiotakis (gooseberry, gooseberry_farm, hair_immediate_fixes, temp_constraint_volume, temp_hair_flow, temp_hair_modifiers, temp_motionpaths, viewport_experiments) November 28, 2014, 15:15 (GMT) |
Merge branch 'master' into viewport_experiments Conflicts: source/blender/editors/space_view3d/view3d_draw.c source/blender/gpu/GPU_buffers.h source/blender/gpu/intern/gpu_buffers.c |
Commit Details:
Full Hash: 54670647770a2536059fe4dd8a37e8bf9ee62d4e
Parent Commits: 9afc5b0, bd434b9