From 365a5b75c11e2ab7b43edf4100e74c61cb66a7c1 Mon Sep 17 00:00:00 2001 From: Howard Trickey Date: Tue, 27 Nov 2018 09:54:49 -0500 Subject: Partial fix for T57868, crash when using bevel from Python. These changes are necessary. Need to mark vertices of edges passed in geom; also the normals.out slot has a custom element type, not ELEM, so need to prevent attempt by python code to convert it to an elem. But this leaves a memory leak. I will rework code to not use normals.out slot at all, but that's a bigger fix. Now there is a crash in a different place (GPU code). Think that if using Op on its own (instead of from edbm_bevel_calc, there needs to be a dependency graph update and maybe more? --- source/blender/bmesh/intern/bmesh_opdefines.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source/blender/bmesh/intern') diff --git a/source/blender/bmesh/intern/bmesh_opdefines.c b/source/blender/bmesh/intern/bmesh_opdefines.c index 778ca89d70c..b7df6d8f90b 100644 --- a/source/blender/bmesh/intern/bmesh_opdefines.c +++ b/source/blender/bmesh/intern/bmesh_opdefines.c @@ -1769,7 +1769,7 @@ static BMOpDefine bmo_bevel_def = { {{"faces.out", BMO_OP_SLOT_ELEMENT_BUF, {BM_FACE}}, /* output faces */ {"edges.out", BMO_OP_SLOT_ELEMENT_BUF, {BM_EDGE}}, /* output edges */ {"verts.out", BMO_OP_SLOT_ELEMENT_BUF, {BM_VERT}}, /* output verts */ - {"normals.out", BMO_OP_SLOT_MAPPING, {(int)BMO_OP_SLOT_SUBTYPE_MAP_ELEM}}, /* output normals per vertex for beveled edges */ + {"normals.out", BMO_OP_SLOT_MAPPING, {(int)BMO_OP_SLOT_SUBTYPE_MAP_INTERNAL}}, /* output normals per vertex for beveled edges */ {{'\0'}}, }, -- cgit v1.2.3