Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Campbell Barton
2016-04-25 14:38:06 +10:00
parent 727f15f7d8
commit e76f94e0fb
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
source/blender/blenkernel/intern/armature.c
View File

@@ -876,7 +876,10 @@ void armature_deform_verts(Object *armOb, Object *target, DerivedMesh *dm, float
int armature_def_nr; int armature_def_nr;
int totchan; 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); invert_m4_m4(obinv, target->obmat);
copy_m4_m4(premat, target->obmat); copy_m4_m4(premat, target->obmat);