Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Tue, 8 May 2018 14:06:32 +0000 (16:06 +0200)
committerBastien Montagne <montagne29@wanadoo.fr>
Tue, 8 May 2018 14:06:32 +0000 (16:06 +0200)
Conflicts:
source/blender/modifiers/intern/MOD_dynamicpaint.c
source/blender/modifiers/intern/MOD_uvproject.c

1  2 
source/blender/blenkernel/intern/writeffmpeg.c
source/blender/modifiers/intern/MOD_dynamicpaint.c
source/blender/modifiers/intern/MOD_meshsequencecache.c
source/blender/modifiers/intern/MOD_uvproject.c

@@@ -338,15 -358,7 +328,15 @@@ ModifierTypeInfo modifierType_UVProjec
                                eModifierTypeFlag_SupportsEditmode |
                                eModifierTypeFlag_EnableInEditmode,
  
-       /* copyData */          copyData,
+       /* copyData */          modifier_copyData_generic,
 +
 +      /* deformVerts_DM */    NULL,
 +      /* deformMatrices_DM */ NULL,
 +      /* deformVertsEM_DM */  NULL,
 +      /* deformMatricesEM_DM*/NULL,
 +      /* applyModifier_DM */  applyModifier,
 +      /* applyModifierEM_DM */NULL,
 +
        /* deformVerts */       NULL,
        /* deformMatrices */    NULL,
        /* deformVertsEM */     NULL,