griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cleanup: use standard BKE_object_free_derived_caches in BKE_mesh_to_curve.

Browse Source 
...Instead of doing own dirty/risky version of the same thing!
This commit is contained in:
Bastien Montagne
2018-06-22 16:58:44 +02:00
parent b1e86ff385
commit bf0dc7ee19
1 changed files with 1 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
source/blender/blenkernel/intern/mesh_convert.c
View File

@@ -817,7 +817,6 @@ void BKE_mesh_to_curve(Main *bmain, Depsgraph *depsgraph, Scene *scene, Object *
/* make new mesh data from the original copy */
Mesh *me_eval = mesh_get_eval_final(depsgraph, scene, ob, CD_MASK_MESH);
ListBase nurblist = {NULL, NULL};
bool needsFree = false;
BKE_mesh_to_curve_nurblist(me_eval, &nurblist, 0);
BKE_mesh_to_curve_nurblist(me_eval, &nurblist, 1);
@@ -832,30 +831,7 @@ void BKE_mesh_to_curve(Main *bmain, Depsgraph *depsgraph, Scene *scene, Object *
ob->data = cu;
ob->type = OB_CURVE;
/* curve objects can't contain DM in usual cases, we could free memory */
needsFree = true;
}
/* Just to avoid dangling pointer, dm will be removed. */
{
DerivedMesh *dm = ob->derivedFinal;
if (dm != NULL) {
dm->needsFree = needsFree;
dm->release(dm);
}
}
if (needsFree) {
BKE_mesh_free(me_eval);
ob->derivedFinal = NULL;
ob->runtime.mesh_eval = NULL;
/* curve object could have got bounding box only in special cases */
if (ob->bb) {
MEM_freeN(ob->bb);
ob->bb = NULL;
}
BKE_object_free_derived_caches(ob);
}
}