From bf4198cdaf7d4fa1a5f91526fb6bbe84d2fa2a37 Mon Sep 17 00:00:00 2001 From: Julian Eisel Date: Mon, 8 Jun 2020 15:42:50 +0200 Subject: Fix crash running "Edit Voxel Size" operator outside of a main 3D View region Accessed `RegionView3D` data from context, which of course would only be set if actually executed from a main 3D View region. --- source/blender/editors/object/object_remesh.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'source/blender/editors') diff --git a/source/blender/editors/object/object_remesh.c b/source/blender/editors/object/object_remesh.c index 22869748b22..846db6728f9 100644 --- a/source/blender/editors/object/object_remesh.c +++ b/source/blender/editors/object/object_remesh.c @@ -584,6 +584,11 @@ static int voxel_size_edit_invoke(bContext *C, wmOperator *op, const wmEvent *ev return OPERATOR_RUNNING_MODAL; } +static bool voxel_size_edit_poll(bContext *C) +{ + return CTX_wm_region_view3d(C) && object_remesh_poll(C); +} + void OBJECT_OT_voxel_size_edit(wmOperatorType *ot) { /* identifiers */ @@ -592,7 +597,7 @@ void OBJECT_OT_voxel_size_edit(wmOperatorType *ot) ot->idname = "OBJECT_OT_voxel_size_edit"; /* api callbacks */ - ot->poll = object_remesh_poll; + ot->poll = voxel_size_edit_poll; ot->invoke = voxel_size_edit_invoke; ot->modal = voxel_size_edit_modal; ot->cancel = voxel_size_edit_cancel; -- cgit v1.2.3