Merge branch 'master' into blender2.8
authorSergey Sharybin <sergey.vfx@gmail.com>
Mon, 7 May 2018 10:26:06 +0000 (12:26 +0200)
committerSergey Sharybin <sergey.vfx@gmail.com>
Mon, 7 May 2018 10:26:06 +0000 (12:26 +0200)
1  2 
source/blender/modifiers/intern/MOD_armature.c

@@@ -108,12 -118,14 +108,13 @@@ static void updateDepsgraph(ModifierDat
                DEG_add_object_relation(ctx->node, amd->object, DEG_OB_COMP_EVAL_POSE, "Armature Modifier");
                DEG_add_object_relation(ctx->node, amd->object, DEG_OB_COMP_TRANSFORM, "Armature Modifier");
        }
+       DEG_add_object_relation(ctx->node, ctx->object, DEG_OB_COMP_TRANSFORM, "Armature Modifier");
  }
  
 -static void deformVerts(ModifierData *md, Object *ob,
 -                        DerivedMesh *derivedData,
 +static void deformVerts(ModifierData *md, const ModifierEvalContext *ctx,
 +                        Mesh *mesh,
                          float (*vertexCos)[3],
 -                        int numVerts,
 -                        ModifierApplyFlag UNUSED(flag))
 +                        int numVerts)
  {
        ArmatureModifierData *amd = (ArmatureModifierData *) md;