Commit: 0bd51f4fc0942319d305c3bb0e7629c965fb2df7 Author: Pablo Dobarro Date: Thu Oct 10 21:05:54 2019 +0200 Branches: blender-v2.81-release https://developer.blender.org/rB0bd51f4fc0942319d305c3bb0e7629c965fb2df7
Fix T70687: Deleting sculpting mask extraction causes crash Reviewed By: jbakker Maniphest Tasks: T70687 Differential Revision: https://developer.blender.org/D6042 =================================================================== 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 8d98a3bf231..25d3118b3a9 100644 --- a/source/blender/editors/mesh/editmesh_mask_extract.c +++ b/source/blender/editors/mesh/editmesh_mask_extract.c @@ -30,6 +30,7 @@ #include "BKE_context.h" #include "BKE_editmesh.h" #include "BKE_layer.h" +#include "BKE_library.h" #include "BKE_mesh.h" #include "BKE_modifier.h" #include "BKE_paint.h" @@ -179,7 +180,7 @@ 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_mesh_free(new_mesh); + BKE_id_free(bmain, new_mesh); new_mesh = BKE_mesh_from_bmesh_nomain(bm, (&(struct BMeshToMeshParams){ .calc_object_remap = false, @@ -190,7 +191,7 @@ static int paint_mask_extract_exec(bContext *C, wmOperator *op) MEM_freeN(em); if (new_mesh->totvert == 0) { - BKE_mesh_free(new_mesh); + BKE_id_free(bmain, new_mesh); return OPERATOR_FINISHED; } _______________________________________________ Bf-blender-cvs mailing list [email protected] https://lists.blender.org/mailman/listinfo/bf-blender-cvs
