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
path: root/source
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@pandora.be>2010-02-15 17:15:34 +0300
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2010-02-15 17:15:34 +0300
commit7f8fbda806284f1325b59859317e90045635189f (patch)
tree25e2c6a7dd6872f77e4430d6fa6cc6b80562aede /source
parent643cf586880d8c07f7ad2b8ea19d0bdf07c4650b (diff)
Fix #21116: wrong shortcut key in view navigation menu.
Diffstat (limited to 'source')
-rw-r--r--source/blender/windowmanager/intern/wm_keymap.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/windowmanager/intern/wm_keymap.c b/source/blender/windowmanager/intern/wm_keymap.c
index 7aada3e6e23..81bef5336e8 100644
--- a/source/blender/windowmanager/intern/wm_keymap.c
+++ b/source/blender/windowmanager/intern/wm_keymap.c
@@ -480,7 +480,7 @@ static wmKeyMapItem *wm_keymap_item_find_props(const bContext *C, const char *op
ar= BKE_area_find_region_type(sa, RGN_TYPE_WINDOW);
if(ar)
- found= wm_keymap_item_find_handlers(C, &ar->handlers, opname, opcontext, properties, hotkey, compare_props, keymap_r);
+ found= wm_keymap_item_find_handlers(C, &ar->handlers, opname, opcontext, properties, compare_props, hotkey, keymap_r);
}
}
else if(ELEM(opcontext, WM_OP_EXEC_REGION_CHANNELS, WM_OP_INVOKE_REGION_CHANNELS)) {
@@ -488,18 +488,18 @@ static wmKeyMapItem *wm_keymap_item_find_props(const bContext *C, const char *op
ar= BKE_area_find_region_type(sa, RGN_TYPE_CHANNELS);
if(ar)
- found= wm_keymap_item_find_handlers(C, &ar->handlers, opname, opcontext, properties, hotkey, compare_props, keymap_r);
+ found= wm_keymap_item_find_handlers(C, &ar->handlers, opname, opcontext, properties, compare_props, hotkey, keymap_r);
}
else if(ELEM(opcontext, WM_OP_EXEC_REGION_PREVIEW, WM_OP_INVOKE_REGION_PREVIEW)) {
if (!(ar && ar->regiontype == RGN_TYPE_PREVIEW))
ar= BKE_area_find_region_type(sa, RGN_TYPE_PREVIEW);
if(ar)
- found= wm_keymap_item_find_handlers(C, &ar->handlers, opname, opcontext, properties, hotkey, compare_props, keymap_r);
+ found= wm_keymap_item_find_handlers(C, &ar->handlers, opname, opcontext, properties, compare_props, hotkey, keymap_r);
}
else {
if(ar)
- found= wm_keymap_item_find_handlers(C, &ar->handlers, opname, opcontext, properties, hotkey, compare_props, keymap_r);
+ found= wm_keymap_item_find_handlers(C, &ar->handlers, opname, opcontext, properties, compare_props, hotkey, keymap_r);
}
}
@@ -511,7 +511,7 @@ static wmKeyMapItem *wm_keymap_item_find(const bContext *C, const char *opname,
wmKeyMapItem *found= wm_keymap_item_find_props(C, opname, opcontext, properties, 1, hotkey, keymap_r);
if(!found)
- found= wm_keymap_item_find_props(C, opname, opcontext, properties, 0, hotkey, keymap_r);
+ found= wm_keymap_item_find_props(C, opname, opcontext, NULL, 0, hotkey, keymap_r);
return found;
}