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>2018-10-26 02:42:31 +0300
committerCampbell Barton <ideasman42@gmail.com>2018-10-26 02:46:35 +0300
commita4a6ed1ba3c86ed842f4373c65d64d28d827f864 (patch)
tree29871b7eb582610021e2260c1ca92ec21187b4c6 /source/blender/windowmanager/intern/wm_event_system.c
parent6c86e1a781162e5a62955b136833ecf78010e2bc (diff)
WM: default tool was being set for space types w/o tools
Add mask for space types so we don't accidentally add tools for space types that don't support it.
Diffstat (limited to 'source/blender/windowmanager/intern/wm_event_system.c')
-rw-r--r--source/blender/windowmanager/intern/wm_event_system.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/windowmanager/intern/wm_event_system.c b/source/blender/windowmanager/intern/wm_event_system.c
index 955713c90f1..e5901e40b71 100644
--- a/source/blender/windowmanager/intern/wm_event_system.c
+++ b/source/blender/windowmanager/intern/wm_event_system.c
@@ -4474,7 +4474,9 @@ void WM_window_cursor_keymap_status_refresh(bContext *C, wmWindow *win)
/* Detect changes to the state. */
{
bToolRef *tref = NULL;
- if (ar->regiontype == RGN_TYPE_WINDOW) {
+ if ((ar->regiontype == RGN_TYPE_WINDOW) &&
+ ((1 << sa->spacetype) & WM_TOOLSYSTEM_SPACE_MASK))
+ {
ViewLayer *view_layer = WM_window_get_active_view_layer(win);
WorkSpace *workspace = WM_window_get_active_workspace(win);
const bToolKey tkey = {