Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2021-10-06 16:01:46 +0300
committerCampbell Barton <ideasman42@gmail.com>2021-10-06 16:08:23 +0300
commite41dddd29a17a77e60bde6a2336fcd3937819bec (patch)
treef54945d97037d5f197c27b9ea1dc203b03cbbb09 /source/blender/windowmanager/intern
parentcda20a7af89c7da76a5016667f24f06eaa8afdb1 (diff)
Gizmo: remove wmGizmoGroup.use_fallback_keymap
This ended up being a copy of: `toolsettings->workspace_tool_type == SCE_WORKSPACE_TOOL_FALLBACK` requiring boiler plate assignment in gizmos refresh callbacks. Remove this struct member and check `toolsettings->workspace_tool_type` directly, since so far there has been no advantage in gizmo-groups being able to control this themselves.
Diffstat (limited to 'source/blender/windowmanager/intern')
-rw-r--r--source/blender/windowmanager/intern/wm_event_system.c12
1 files changed, 5 insertions, 7 deletions
diff --git a/source/blender/windowmanager/intern/wm_event_system.c b/source/blender/windowmanager/intern/wm_event_system.c
index a2625f233b5..f4753c7c190 100644
--- a/source/blender/windowmanager/intern/wm_event_system.c
+++ b/source/blender/windowmanager/intern/wm_event_system.c
@@ -4060,14 +4060,12 @@ void WM_event_get_keymap_from_toolsystem_fallback(wmWindowManager *wm,
if (gzgroup != NULL) {
if (gzgroup->type->flag & WM_GIZMOGROUPTYPE_TOOL_FALLBACK_KEYMAP) {
/* If all are hidden, don't override. */
- if (gzgroup->use_fallback_keymap) {
- is_gizmo_visible = true;
- wmGizmo *highlight = wm_gizmomap_highlight_get(gzmap);
- if (highlight) {
- is_gizmo_highlight = true;
- }
- add_keymap = true;
+ is_gizmo_visible = true;
+ wmGizmo *highlight = wm_gizmomap_highlight_get(gzmap);
+ if (highlight) {
+ is_gizmo_highlight = true;
}
+ add_keymap = true;
}
}
}