Merge branch 'master' into blender2.8

[blender.git] / source / blender / blenkernel / intern / armature.c

diff --git a/source/blender/blenkernel/intern/armature.c b/source/blender/blenkernel/intern/armature.c
index 0c1af5dcbe85b5820f3a631589747462028a2c74..6f04be653d1787b98cbebd8da8b228c6061f6f3d 100644 (file)
--- a/source/blender/blenkernel/intern/armature.c
+++ b/source/blender/blenkernel/intern/armature.c
@@ -981,6 +981,11 @@ void armature_deform_verts(Object *armOb, Object *target, DerivedMesh *dm, float
                return;
        }
 
+       if ((armOb->pose->flag & POSE_RECALC) != 0) {
+               printf("ERROR! Trying to evaluate influence of armature '%s' which needs Pose recalc!", armOb->id.name);
+               BLI_assert(0);
+       }
+
        invert_m4_m4(obinv, target->obmat);
        copy_m4_m4(premat, target->obmat);
        mul_m4_m4m4(postmat, obinv, armOb->obmat);