From eb6fc05f25d669eab8f0f8c0d19bb92addd1033d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= Date: Wed, 25 Apr 2018 11:04:40 +0200 Subject: =?UTF-8?q?Modifiers:=20Armature=20DerivedMesh=20=E2=86=92=20Mesh?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The mesh parameter of armature_deform_verts() is now const, to indicate that it's safe to pass ob->data to it directly. --- source/blender/blenkernel/intern/modifier.c | 66 ++++++++++++++++++++--------- 1 file changed, 45 insertions(+), 21 deletions(-) (limited to 'source/blender/blenkernel/intern/modifier.c') diff --git a/source/blender/blenkernel/intern/modifier.c b/source/blender/blenkernel/intern/modifier.c index f7892e2f08b..3caa3a032ff 100644 --- a/source/blender/blenkernel/intern/modifier.c +++ b/source/blender/blenkernel/intern/modifier.c @@ -1033,14 +1033,20 @@ void modifier_deformMatrices_DM_deprecated(struct ModifierData *md, struct Depsg mti->deformMatrices_DM(md, depsgraph, ob, dm, vertexCos, defMats, numVerts); } else { - struct Mesh mesh; - BKE_mesh_init(&mesh); - - DM_to_mesh(dm, &mesh, ob, CD_MASK_EVERYTHING, false); + /* TODO(sybren): deduplicate all the copies of this code in this file. */ + Mesh *mesh = NULL; + if (dm != NULL) { + mesh = BKE_libblock_alloc_notest(ID_ME); + BKE_mesh_init(mesh); + DM_to_mesh(dm, mesh, ob, CD_MASK_EVERYTHING, false); + } - mti->deformMatrices(md, depsgraph, ob, &mesh, vertexCos, defMats, numVerts); + mti->deformMatrices(md, depsgraph, ob, mesh, vertexCos, defMats, numVerts); - BKE_mesh_free(&mesh); + if (mesh != NULL) { + BKE_mesh_free(mesh); + MEM_freeN(mesh); + } } } @@ -1054,6 +1060,7 @@ void modifier_deformVertsEM_DM_deprecated(struct ModifierData *md, struct Depsgr mti->deformVertsEM_DM(md, depsgraph, ob, editData, dm, vertexCos, numVerts); } else { + /* TODO(sybren): deduplicate all the copies of this code in this file. */ Mesh *mesh = NULL; if (dm != NULL) { mesh = BKE_libblock_alloc_notest(ID_ME); @@ -1080,14 +1087,20 @@ void modifier_deformMatricesEM_DM_deprecated(struct ModifierData *md, struct Dep mti->deformMatricesEM_DM(md, depsgraph, ob, editData, dm, vertexCos, defMats, numVerts); } else { - struct Mesh mesh; - BKE_mesh_init(&mesh); - - DM_to_mesh(dm, &mesh, ob, CD_MASK_EVERYTHING, false); + /* TODO(sybren): deduplicate all the copies of this code in this file. */ + Mesh *mesh = NULL; + if (dm != NULL) { + mesh = BKE_libblock_alloc_notest(ID_ME); + BKE_mesh_init(mesh); + DM_to_mesh(dm, mesh, ob, CD_MASK_EVERYTHING, false); + } - mti->deformMatricesEM(md, depsgraph, ob, editData, &mesh, vertexCos, defMats, numVerts); + mti->deformMatricesEM(md, depsgraph, ob, editData, mesh, vertexCos, defMats, numVerts); - BKE_mesh_free(&mesh); + if (mesh != NULL) { + BKE_mesh_free(mesh); + MEM_freeN(mesh); + } } } @@ -1140,19 +1153,30 @@ struct DerivedMesh *modifier_applyModifierEM_DM_deprecated(struct ModifierData * return mti->applyModifierEM_DM(md, depsgraph, ob, editData, dm, flag); } else { - struct Mesh mesh; - BKE_mesh_init(&mesh); - - DM_to_mesh(dm, &mesh, ob, CD_MASK_EVERYTHING, false); + /* TODO(sybren): deduplicate all the copies of this code in this file. */ + Mesh *mesh = NULL; + if (dm != NULL) { + mesh = BKE_libblock_alloc_notest(ID_ME); + BKE_mesh_init(mesh); + DM_to_mesh(dm, mesh, ob, CD_MASK_EVERYTHING, false); + } - struct Mesh *new_mesh = mti->applyModifierEM(md, depsgraph, ob, editData, &mesh, flag); + struct Mesh *new_mesh = mti->applyModifierEM(md, depsgraph, ob, editData, mesh, flag); DerivedMesh *ndm = CDDM_from_mesh(new_mesh); + if(new_mesh != mesh) { + /* Make a DM that doesn't reference new_mesh so we can free the latter. */ + /* TODO(sybren): create CDDM_from_mesh_ex() that creates a copy directly. */ + DerivedMesh *nonref_dm = CDDM_copy(ndm); + ndm->release(ndm); + ndm = nonref_dm; - if(new_mesh != &mesh) { - BKE_mesh_free(&mesh); - - /* XXX free new_mesh? */ + BKE_mesh_free(new_mesh); + MEM_freeN(new_mesh); + } + if (mesh != NULL) { + BKE_mesh_free(mesh); + MEM_freeN(mesh); } return ndm; -- cgit v1.2.3