Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPablo Dobarro <pablodp606@gmail.com>2019-10-10 22:05:54 +0300
committerPablo Dobarro <pablodp606@gmail.com>2019-10-31 16:51:42 +0300
commit0bd51f4fc0942319d305c3bb0e7629c965fb2df7 (patch)
treea50e10fab59876c6eff84dbe706f15568260c0e6 /source/blender/editors/mesh/editmesh_mask_extract.c
parentcd827194f7cc771e9947d474ba0e7c4ae2a2aa9a (diff)
Fix T70687: Deleting sculpting mask extraction causes crash
Reviewed By: jbakker Maniphest Tasks: T70687 Differential Revision: https://developer.blender.org/D6042
Diffstat (limited to 'source/blender/editors/mesh/editmesh_mask_extract.c')
-rw-r--r--source/blender/editors/mesh/editmesh_mask_extract.c5
1 files changed, 3 insertions, 2 deletions
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;
}