Blender Git Loki
Git Commits -> Revision 3dda7a4
Revision 3dda7a4 by Martin Felke (fracture_modifier, fracture_modifier-master, temp-fracture-modifier-2.8) January 24, 2015, 12:15 (GMT) |
Merge remote-tracking branch 'refs/remotes/origin/master' into fracture_modifier Conflicts: source/blender/editors/space_outliner/outliner_draw.c source/blender/makesdna/DNA_modifier_types.h source/blender/makesrna/intern/rna_modifier.c source/blender/modifiers/MOD_modifiertypes.h source/blender/modifiers/intern/MOD_util.c (reverse-merged from commit 4401500cac4d3ff6e29d8ba4cbc476df49d88424) |
Commit Details:
Full Hash: 3dda7a4312e2f0d3cd348d1cad575e4bcb9a54d9
Parent Commits: bbf09d9, fd490f4