[Bf-blender-cvs] [e9d07aa4a0e] master: Correct error in last commit
Campbell Barton
noreply at git.blender.org
Wed May 29 08:52:57 CEST 2019
Commit: e9d07aa4a0e1607ad414394d3bc9286173128334
Author: Campbell Barton
Date: Wed May 29 16:51:56 2019 +1000
Branches: master
https://developer.blender.org/rBe9d07aa4a0e1607ad414394d3bc9286173128334
Correct error in last commit
===================================================================
M release/scripts/presets/keyconfig/keymap_data/blender_default.py
M source/blender/windowmanager/gizmo/intern/wm_gizmo_group.c
===================================================================
diff --git a/release/scripts/presets/keyconfig/keymap_data/blender_default.py b/release/scripts/presets/keyconfig/keymap_data/blender_default.py
index c930fbb23c6..c73b5be3e13 100644
--- a/release/scripts/presets/keyconfig/keymap_data/blender_default.py
+++ b/release/scripts/presets/keyconfig/keymap_data/blender_default.py
@@ -4736,7 +4736,7 @@ def km_generic_gizmo_click_drag(_params):
keymap = (
"Generic Gizmo Drag",
{"space_type": 'EMPTY', "region_type": 'WINDOW'},
- {"items": _template_items_gizmo_tweak_value_drag()},
+ {"items": _template_items_gizmo_tweak_value_click_drag()},
)
return keymap
@@ -5860,6 +5860,7 @@ def generate_keymaps(params=None):
# Gizmos.
km_generic_gizmo(params),
+ km_generic_gizmo_drag(params),
km_generic_gizmo_click_drag(params),
km_generic_gizmo_select(params),
km_generic_gizmo_tweak_modal_map(params),
diff --git a/source/blender/windowmanager/gizmo/intern/wm_gizmo_group.c b/source/blender/windowmanager/gizmo/intern/wm_gizmo_group.c
index 75c2c40a6c4..b9de69122c4 100644
--- a/source/blender/windowmanager/gizmo/intern/wm_gizmo_group.c
+++ b/source/blender/windowmanager/gizmo/intern/wm_gizmo_group.c
@@ -753,7 +753,7 @@ struct wmKeyMap *WM_gizmo_keymap_generic_drag_with_keyconfig(wmKeyConfig *kc)
}
struct wmKeyMap *WM_gizmo_keymap_generic_drag(wmWindowManager *wm)
{
- return WM_gizmo_keymap_generic_click_drag_with_keyconfig(wm->defaultconf);
+ return WM_gizmo_keymap_generic_drag_with_keyconfig(wm->defaultconf);
}
struct wmKeyMap *WM_gizmo_keymap_generic_click_drag_with_keyconfig(wmKeyConfig *kc)
More information about the Bf-blender-cvs
mailing list