[Bf-blender-cvs] [68c55035708] blender2.8: Merge branch 'master' into blender2.8

[Sergey Sharybin]

Commit: 68c55035708bb3b5b055a61c6727837a111eb524
Author: Sergey Sharybin
Date:   Mon May 7 12:26:06 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB68c55035708bb3b5b055a61c6727837a111eb524

Merge branch 'master' into blender2.8

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



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

diff --cc source/blender/modifiers/intern/MOD_armature.c
index 8e8b095d069,579854be725..6644e5383df
--- a/source/blender/modifiers/intern/MOD_armature.c
+++ b/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;