[Bf-blender-cvs] [1e273dbc3c5] master: Fix extract mask freed memory use & leak

[Campbell Barton]

Commit: 1e273dbc3c52f6d899aa9b3788326bc06db2775d
Author: Campbell Barton
Date:   Fri Oct 4 01:12:37 2019 +1000
Branches: master
https://developer.blender.org/rB1e273dbc3c52f6d899aa9b3788326bc06db2775d

Fix extract mask freed memory use & leak

===================================================================

M	source/blender/editors/mesh/editmesh_mask_extract.c

===================================================================

diff --git a/source/blender/editors/mesh/editmesh_mask_extract.c b/source/blender/editors/mesh/editmesh_mask_extract.c
index ab38592dfa3..f4f5fa26f17 100644
--- a/source/blender/editors/mesh/editmesh_mask_extract.c
+++ b/source/blender/editors/mesh/editmesh_mask_extract.c
@@ -175,7 +175,6 @@ static int paint_mask_extract_exec(bContext *C, wmOperator *op)
   }
 
   BM_mesh_elem_hflag_disable_all(bm, BM_VERT | BM_EDGE | BM_FACE, BM_ELEM_SELECT, false);
-  BKE_editmesh_free_derivedmesh(em);
 
   BKE_mesh_free(new_mesh);
   new_mesh = BKE_mesh_from_bmesh_nomain(bm,
@@ -184,7 +183,8 @@ static int paint_mask_extract_exec(bContext *C, wmOperator *op)
                                         }),
                                         mesh);
 
-  BM_mesh_free(bm);
+  BKE_editmesh_free(em);
+  MEM_freeN(em);
 
   if (new_mesh->totvert == 0) {
     BKE_mesh_free(new_mesh);
@@ -198,8 +198,6 @@ static int paint_mask_extract_exec(bContext *C, wmOperator *op)
   Object *new_ob = ED_object_add_type(C, OB_MESH, NULL, ob->loc, ob->rot, false, local_view_bits);
   BKE_mesh_nomain_to_mesh(new_mesh, new_ob->data, new_ob, &CD_MASK_EVERYTHING, true);
 
-  BKE_mesh_free(new_mesh);
-
   if (RNA_boolean_get(op->ptr, "apply_shrinkwrap")) {
     BKE_shrinkwrap_mesh_nearest_surface_deform(C, new_ob, ob);
   }