Commit: 844a6d182025fa08154113a9022d2c9d9d3737e8
Author: Sybren A. Stüvel
Date: Tue Apr 24 11:48:36 2018 +0200
Branches: temp-modifier-rm-cddm
https://developer.blender.org/rB844a6d182025fa08154113a9022d2c9d9d3737e8
Copy CDDM to allow freeing the mesh
===================================================================
M source/blender/blenkernel/intern/modifier.c
===================================================================
diff --git a/source/blender/blenkernel/intern/modifier.c
b/source/blender/blenkernel/intern/modifier.c
index 3d494d819b9..83fa0f2b154 100644
--- a/source/blender/blenkernel/intern/modifier.c
+++ b/source/blender/blenkernel/intern/modifier.c
@@ -1111,10 +1111,15 @@ struct DerivedMesh
*modifier_applyModifier_DM_deprecated(struct ModifierData *md
struct Mesh *new_mesh = mti->applyModifier(md, depsgraph, ob,
mesh, flag);
DerivedMesh *ndm = CDDM_from_mesh(new_mesh);
-
if(new_mesh != mesh) {
-// BKE_mesh_free(new_mesh);
-// MEM_freeN(new_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;
+
+ BKE_mesh_free(new_mesh);
+ MEM_freeN(new_mesh);
}
return ndm;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
