blender
/
blender
136
406
Fork 588
Code Issues 6.2k Pull Requests 754 Projects 19 Wiki Activity

Cleanup: use depends-on-cursor for "Object Transfer Mode" operator 

Replace modal operator with the OPTYPE_DEPENDS_ON_CURSOR flag.

This has the advantage of showing the shortcut in the menu.
This commit is contained in:
Campbell Barton 2021-10-18 17:07:24 +11:00
parent 2a8e5128c1
commit 3f4ba64ae3
Notes: blender-bot 2023-10-12 12:49:04 +02:00 
Referenced by issue #92406, It is not possible to set a hotkey to Transfer Sculpt Mode
2 changed files with 3 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
release/scripts/startup/bl_ui/space_view3d.py
View File

@ -3049,8 +3049,7 @@ class VIEW3D_MT_sculpt(Menu):
layout.separator()
props = layout.operator("object.transfer_mode", text="Transfer Sculpt Mode")
props.use_eyedropper = True
layout.operator("object.transfer_mode", text="Transfer Sculpt Mode")
class VIEW3D_MT_mask(Menu):

52
source/blender/editors/object/object_modes.c
View File

@ -497,51 +497,8 @@ static bool object_transfer_mode_to_base(bContext *C, wmOperator *op, Base *base
return mode_transfered;
}
static int object_transfer_mode_modal(bContext *C, wmOperator *op, const wmEvent *event)
{
switch (event->type) {
case LEFTMOUSE:
if (event->val == KM_PRESS) {
WM_cursor_modal_restore(CTX_wm_window(C));
ED_workspace_status_text(C, NULL);
/* This ensures that the click was done in an viewport region. */
bScreen *screen = CTX_wm_screen(C);
ARegion *region = BKE_screen_find_main_region_at_xy(
screen, SPACE_VIEW3D, event->x, event->y);
if (!region) {
return OPERATOR_CANCELLED;
}
const int mval[2] = {event->x - region->winrct.xmin, event->y - region->winrct.ymin};
Base *base_dst = ED_view3d_give_base_under_cursor(C, mval);
const bool mode_transfered = object_transfer_mode_to_base(C, op, base_dst);
if (!mode_transfered) {
return OPERATOR_CANCELLED;
}
return OPERATOR_FINISHED;
}
break;
case RIGHTMOUSE: {
WM_cursor_modal_restore(CTX_wm_window(C));
ED_workspace_status_text(C, NULL);
return OPERATOR_CANCELLED;
}
}
return OPERATOR_RUNNING_MODAL;
}
static int object_transfer_mode_invoke(bContext *C, wmOperator *op, const wmEvent *event)
{
const bool use_eyedropper = RNA_boolean_get(op->ptr, "use_eyedropper");
if (use_eyedropper) {
ED_workspace_status_text(C, TIP_("Click in the viewport to select an object"));
WM_cursor_modal_set(CTX_wm_window(C), WM_CURSOR_EYEDROPPER);
WM_event_add_modal_handler(C, op);
return OPERATOR_RUNNING_MODAL;
}
Object *ob_src = CTX_data_active_object(C);
const eObjectMode src_mode = (eObjectMode)ob_src->mode;
@ -569,17 +526,12 @@ void OBJECT_OT_transfer_mode(wmOperatorType *ot)
/* api callbacks */
ot->invoke = object_transfer_mode_invoke;
ot->modal = object_transfer_mode_modal;
ot->poll = object_transfer_mode_poll;
/* Undo push is handled by the operator. */
ot->flag = OPTYPE_REGISTER;
ot->flag = OPTYPE_REGISTER | OPTYPE_DEPENDS_ON_CURSOR;
RNA_def_boolean(ot->srna,
"use_eyedropper",
false,
"Use Eyedropper",
"Pick the object to switch to using an eyedropper");
ot->cursor_pending = WM_CURSOR_EYEDROPPER;
RNA_def_boolean(ot->srna,
"use_flash_on_transfer",