diff options
author | Campbell Barton <ideasman42@gmail.com> | 2014-02-28 13:02:30 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2014-02-28 13:12:45 +0400 |
commit | ea269c21eaf663cd74c1c54acdcc9b0a0b19d3d4 (patch) | |
tree | ede0c7397e00f67e5e679d9293a6649be8107652 /source/blender/blenkernel/intern/editmesh.c | |
parent | d2a5ea04ed8448865b4daa21c0010727eee118ba (diff) |
Code cleanup: move edit-derivedmesh free to BKE_editmesh_free_derivedmesh
Diffstat (limited to 'source/blender/blenkernel/intern/editmesh.c')
-rw-r--r-- | source/blender/blenkernel/intern/editmesh.c | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/source/blender/blenkernel/intern/editmesh.c b/source/blender/blenkernel/intern/editmesh.c index 88cef0ec031..65faf59978a 100644 --- a/source/blender/blenkernel/intern/editmesh.c +++ b/source/blender/blenkernel/intern/editmesh.c @@ -187,21 +187,24 @@ void BKE_editmesh_update_linked_customdata(BMEditMesh *em) } } -/*does not free the BMEditMesh struct itself*/ -void BKE_editmesh_free(BMEditMesh *em) +void BKE_editmesh_free_derivedmesh(BMEditMesh *em) { - if (em->derivedFinal) { - if (em->derivedFinal != em->derivedCage) { - em->derivedFinal->needsFree = 1; - em->derivedFinal->release(em->derivedFinal); - } - em->derivedFinal = NULL; - } if (em->derivedCage) { em->derivedCage->needsFree = 1; em->derivedCage->release(em->derivedCage); - em->derivedCage = NULL; } + if (em->derivedFinal && em->derivedFinal != em->derivedCage) { + em->derivedFinal->needsFree = 1; + em->derivedFinal->release(em->derivedFinal); + } + + em->derivedCage = em->derivedFinal = NULL; +} + +/*does not free the BMEditMesh struct itself*/ +void BKE_editmesh_free(BMEditMesh *em) +{ + BKE_editmesh_free_derivedmesh(em); BKE_editmesh_color_free(em); |