diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2016-04-25 07:38:06 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2016-04-25 07:41:11 +0300 |
| commit | e76f94e0fb388d849d904b6d19da04a25b62e081 (patch) | |
| tree | 1a8468a07c2a59193da26fc09a3139b76c28dc48 /source/blender/blenkernel/intern/armature.c | |
| parent | 727f15f7d8820f1dc9277fdabcfce47bdb9935fe (diff) | |
Fix T48263: Armature modifier crash w/ non-armature objects
Diffstat (limited to 'source/blender/blenkernel/intern/armature.c')
| -rw-r--r-- | source/blender/blenkernel/intern/armature.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/armature.c b/source/blender/blenkernel/intern/armature.c index 54fe98940aa..254d994deb7 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); |