[Bf-blender-cvs] [43be4343107] blender2.8: Merge branch 'master' into blender2.8

[Bastien Montagne]

Commit: 43be4343107b1dc2a05353a6ff41360cce27d629
Author: Bastien Montagne
Date:   Tue May 8 16:06:32 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB43be4343107b1dc2a05353a6ff41360cce27d629

Merge branch 'master' into blender2.8

Conflicts:
	source/blender/modifiers/intern/MOD_dynamicpaint.c
	source/blender/modifiers/intern/MOD_uvproject.c

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



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

diff --cc source/blender/modifiers/intern/MOD_uvproject.c
index d3090f2caf3,6006cd92ec9..a2c767c1242
--- a/source/blender/modifiers/intern/MOD_uvproject.c
+++ b/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,