diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-29 15:56:38 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-29 15:57:02 +0300 |
| commit | 5ba87cf22ebdfa660ec2044a8e97c3501c573176 (patch) | |
| tree | d071dcf8c643366069eb80f0ed9a787e68864388 /source/blender/modifiers/intern/MOD_particlesystem.c | |
| parent | a59df21ad8282c20f33a216ba9e3ba739881577d (diff) | |
Cleanup: remove another bunch of DM usages, includes etc.
Diffstat (limited to 'source/blender/modifiers/intern/MOD_particlesystem.c')
| -rw-r--r-- | source/blender/modifiers/intern/MOD_particlesystem.c | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/source/blender/modifiers/intern/MOD_particlesystem.c b/source/blender/modifiers/intern/MOD_particlesystem.c index 784e44f5758..2d725a821db 100644 --- a/source/blender/modifiers/intern/MOD_particlesystem.c +++ b/source/blender/modifiers/intern/MOD_particlesystem.c @@ -41,7 +41,6 @@ #include "BLI_utildefines.h" -#include "BKE_cdderivedmesh.h" #include "BKE_editmesh.h" #include "BKE_mesh.h" #include "BKE_library.h" @@ -218,20 +217,24 @@ static void deformVerts( } } -/* disabled particles in editmode for now, until support for proper derivedmesh +/* disabled particles in editmode for now, until support for proper evaluated mesh * updates is coded */ #if 0 static void deformVertsEM( - ModifierData *md, Object *ob, EditMesh *editData, - DerivedMesh *derivedData, float (*vertexCos)[3], int numVerts) + ModifierData *md, Object *ob, BMEditMesh *editData, + Mesh *mesh, float (*vertexCos)[3], int numVerts) { - DerivedMesh *dm = derivedData; - - if (!derivedData) dm = CDDM_from_editmesh(editData, ob->data); + const bool do_temp_mesh = (mesh == NULL); + if (do_temp_mesh) { + mesh = BKE_id_new_nomain(ID_ME, ((ID *)ob->data)->name); + BM_mesh_bm_to_me(NULL, editData->bm, mesh, &((BMeshToMeshParams){0})); + } - deformVerts(md, ob, dm, vertexCos, numVerts); + deformVerts(md, ob, mesh, vertexCos, numVerts); - if (!derivedData) dm->release(dm); + if (derivedData) { + BKE_id_free(NULL, mesh); + } } #endif |