archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix T72416: Tool settings ignored when activated from gizmo

Browse Source
This commit is contained in:
Campbell Barton
2019-12-17 14:55:41 +11:00
parent 2564e2a2ad
commit aa1af7f8e4
2 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/editors/space_view3d/view3d_gizmo_tool_generic.c
View File

@@ -109,6 +109,8 @@ static wmGizmo *tool_generic_create_gizmo(const bContext *C, wmGizmoGroup *gzgro
RNA_float_set(gz->ptr, "backdrop_fill_alpha", 0.125f);
}
gz->flag |= WM_GIZMO_OPERATOR_TOOL_INIT;
bToolRef *tref = WM_toolsystem_ref_from_context((bContext *)C);
wmWindowManager *wm = CTX_wm_manager(C);
struct wmKeyConfig *kc = wm->defaultconf;

15
source/blender/windowmanager/intern/wm_event_system.c
View File

@@ -2265,9 +2265,18 @@ static int wm_handler_operator_call(bContext *C,
bool use_last_properties = true;
PointerRNA tool_properties = {0};
bToolRef *keymap_tool = ((handler_base->type == WM_HANDLER_TYPE_KEYMAP) ?
((wmEventHandler_Keymap *)handler_base)->keymap_tool :
NULL);
bToolRef *keymap_tool = NULL;
if (handler_base->type == WM_HANDLER_TYPE_KEYMAP) {
keymap_tool = ((wmEventHandler_Keymap *)handler_base)->keymap_tool;
}
else if (handler_base->type == WM_HANDLER_TYPE_GIZMO) {
wmGizmoMap *gizmo_map = ((wmEventHandler_Gizmo *)handler_base)->gizmo_map;
wmGizmo *gz = wm_gizmomap_highlight_get(gizmo_map);
if (gz && (gz->flag & WM_GIZMO_OPERATOR_TOOL_INIT)) {
keymap_tool = WM_toolsystem_ref_from_context(C);
}
}
const bool is_tool = (keymap_tool != NULL);
const bool use_tool_properties = is_tool;