blender/blender
147
472
Fork 689
Code Issues 6.7k Pull Requests 889 Projects 18 Wiki Activity

Fix #124931: Fix crash droping imagenes in overlapping regions #124921

Manually merged
Campbell Barton merged 1 commits from guishe/blender:fix-image-crash into main 2024-07-18 07:01:33 +02:00
Conversation 1 Commits 1 Files Changed 1 +6 -1
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
source/blender/editors/object/object_add.cc
View File

@ -1299,6 +1299,11 @@ static int object_image_add_invoke(bContext *C, wmOperator *op, const wmEvent *e
return OPERATOR_FINISHED;
}
static bool object_image_add_poll(bContext *C)
{
return ED_operator_objectmode(C) && CTX_wm_region_view3d(C);
}
void OBJECT_OT_empty_image_add(wmOperatorType *ot)
{
/* identifiers */
@ -1309,7 +1314,7 @@ void OBJECT_OT_empty_image_add(wmOperatorType *ot)
/* api callbacks */
ot->invoke = object_image_add_invoke;
ot->exec = object_image_add_exec;
ot->poll = ED_operator_objectmode;
ot->poll = object_image_add_poll;
/* flags */
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;