[Bf-blender-cvs] [2146f74f22c] temp-modifier-rm-cddm: Merge remote-tracking branch 'origin/blender2.8' into temp-modifier-rm-cddm

[Sybren A. Stüvel]

Commit: 2146f74f22ceeef6e773ba081703703c8fe08c1e
Author: Sybren A. Stüvel
Date:   Fri Apr 20 10:21:35 2018 +0200
Branches: temp-modifier-rm-cddm
https://developer.blender.org/rB2146f74f22ceeef6e773ba081703703c8fe08c1e

Merge remote-tracking branch 'origin/blender2.8' into temp-modifier-rm-cddm

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



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

diff --cc source/blender/blenkernel/intern/editderivedmesh.c
index 07f9ddf8bc7,1e211d1c4af..f5e5a37c7d7
--- a/source/blender/blenkernel/intern/editderivedmesh.c
+++ b/source/blender/blenkernel/intern/editderivedmesh.c
@@@ -1654,17 -1004,9 +998,9 @@@ DerivedMesh *getEditDerivedBMesh
  	bmdm->dm.foreachMappedEdge = emDM_foreachMappedEdge;
  	bmdm->dm.foreachMappedFaceCenter = emDM_foreachMappedFaceCenter;
  
- 	bmdm->dm.drawEdges = emDM_drawEdges;
- 	bmdm->dm.drawMappedEdges = emDM_drawMappedEdges;
- 	bmdm->dm.drawMappedEdgesInterp = emDM_drawMappedEdgesInterp;
- 	bmdm->dm.drawMappedFaces = emDM_drawMappedFaces;
- 	bmdm->dm.drawMappedFacesGLSL = emDM_drawMappedFacesGLSL;
- 	bmdm->dm.drawMappedFacesMat = emDM_drawMappedFacesMat;
- 	bmdm->dm.drawFacesGLSL = emDM_drawFacesGLSL;
- 
  	bmdm->dm.release = emDM_release;
  
 -	bmdm->vertexCos = (const float (*)[3])vertexCos;
 +	bmdm->emd.vertexCos = (const float (*)[3])vertexCos;
  	bmdm->dm.deformedOnly = (vertexCos != NULL);
  
  	const int cd_dvert_offset = (data_mask & CD_MASK_MDEFORMVERT) ?
diff --cc source/blender/modifiers/intern/MOD_particleinstance.c
index b14f9f8fc75,d7cb7fd8d94..399a02bd69b
--- a/source/blender/modifiers/intern/MOD_particleinstance.c
+++ b/source/blender/modifiers/intern/MOD_particleinstance.c
@@@ -442,11 -537,10 +545,11 @@@ ModifierTypeInfo modifierType_ParticleI
  	/* deformMatrices */    NULL,
  	/* deformVertsEM */     NULL,
  	/* deformMatricesEM */  NULL,
 -	/* applyModifier */     applyModifier,
 +	/* applyModifier */     NULL,
  	/* applyModifierEM */   NULL,
 +
  	/* initData */          initData,
- 	/* requiredDataMask */  NULL,
+ 	/* requiredDataMask */  requiredDataMask,
  	/* freeData */          NULL,
  	/* isDisabled */        isDisabled,
  	/* updateDepsgraph */   updateDepsgraph,