Blender Git Loki
Git Commits -> Revision 7bb5380
Revision 7bb5380 by Bastien Montagne (gooseberry, gooseberry_farm, temp_constraint_volume, temp_hair_modifiers, temp_motionpaths) January 10, 2015, 09:26 (GMT) |
Merge branch 'master' into gooseberry Conflicts: source/blender/editors/object/object_intern.h source/blender/editors/object/object_ops.c source/blender/makesrna/intern/rna_modifier.c |
Commit Details:
Full Hash: 7bb53800ba162dbb8c2c103a4232468f84ae6f0b
Parent Commits: 9590e77, e61a707