Blender Git Loki
Git Commits -> Revision bf7e8b4
Revision bf7e8b4 by Lukas Toenne (alembic, gooseberry, gooseberry_farm, hair_guides, hair_guides_grooming, hair_object, strand_editmode, strand_gpu, strand_nodes, temp_motionpaths, tmp_hair_curves) May 4, 2015, 15:14 (GMT) |
Merge branch 'master' into strand_editmode Conflicts: source/blender/bmesh/bmesh_class.h source/blender/bmesh/intern/bmesh_mesh_conv.h |
Commit Details:
Full Hash: bf7e8b42fa269c310e456fa55263ff2d9849804e
Parent Commits: 1227e5c, 20e9602