[Bf-blender-cvs] [e76f94e] master: Fix T48263: Armature modifier crash w/ non-armature objects

[Campbell Barton]

Commit: e76f94e0fb388d849d904b6d19da04a25b62e081
Author: Campbell Barton
Date:   Mon Apr 25 14:38:06 2016 +1000
Branches: master
https://developer.blender.org/rBe76f94e0fb388d849d904b6d19da04a25b62e081

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

===================================================================

M	source/blender/blenkernel/intern/armature.c

===================================================================

diff --git a/source/blender/blenkernel/intern/armature.c b/source/blender/blenkernel/intern/armature.c
index 54fe989..254d994 100644
--- 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);