[Bf-blender-cvs] [e1ec9ecafc8] temp-lanpr-cleanup: Merge remote-tracking branch 'origin/master' into temp-lanpr-cleanup

[YimingWu]

Commit: e1ec9ecafc8f7993d1859786537acf2b011993bb
Author: YimingWu
Date:   Tue Oct 8 10:57:47 2019 +0800
Branches: temp-lanpr-cleanup
https://developer.blender.org/rBe1ec9ecafc8f7993d1859786537acf2b011993bb

Merge remote-tracking branch 'origin/master' into temp-lanpr-cleanup

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



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

diff --cc source/blender/editors/mesh/editmesh_mask_extract.c
index 6d51e1d3393,272bae50f17..6dcd2fc3928
--- a/source/blender/editors/mesh/editmesh_mask_extract.c
+++ b/source/blender/editors/mesh/editmesh_mask_extract.c
@@@ -179,9 -183,11 +183,10 @@@ static int paint_mask_extract_exec(bCon
    new_mesh = BKE_mesh_from_bmesh_nomain(bm,
                                          (&(struct BMeshToMeshParams){
                                              .calc_object_remap = false,
 -                                        }),
 -                                        mesh);
 +                                        }));
  
-   BM_mesh_free(bm);
+   BKE_editmesh_free(em);
+   MEM_freeN(em);
  
    if (new_mesh->totvert == 0) {
      BKE_mesh_free(new_mesh);