Blender Git Loki
Git Commits -> Revision 3102ced
Revision 3102ced by Antonis Ryakiotakis (gooseberry, gooseberry_farm, hair_immediate_fixes, hair_system, temp_constraint_volume, temp_hair_flow, temp_hair_modifiers, temp_motionpaths) November 19, 2014, 15:48 (GMT) |
Merge branch 'wiggly-widgets' into gooseberry Conflicts: source/blender/editors/include/ED_view3d.h source/blender/editors/space_view3d/view3d_draw.c source/blender/editors/transform/transform_manipulator.c |
Commit Details:
Full Hash: 3102ced86466749f5cb0a99599588d0ac0fdf365
Parent Commits: ca65c70, ef310b2