Fix T48263: Armature modifier crash w/ non-armature objects

2016-04-25 14:38:06 +10:00
parent 727f15f7d8
commit e76f94e0fb
1 changed files with 4 additions and 1 deletions
--- a/source/blender/blenkernel/intern/armature.c
+++ b/source/blender/blenkernel/intern/armature.c
@@ -876,7 +876,10 @@ void armature_deform_verts(Object *armOb, Object *target, DerivedMesh *dm, float
 	int armature_def_nr;
 	int totchan;

-	if (arm->edbo) return;
+	/* in editmode, or not an armature */
+	if (arm->edbo || (armOb->pose == NULL)) {
+		return;
+	}

 	invert_m4_m4(obinv, target->obmat);
 	copy_m4_m4(premat, target->obmat);