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:
authorMartin Poirier <theeth@yahoo.com>2009-11-18 20:08:29 +0300
committerMartin Poirier <theeth@yahoo.com>2009-11-18 20:08:29 +0300
commita90c770286eb805a11e096017c51dfe5a62b88f3 (patch)
tree291cecd70968a73edfeb93ccd7a07f57d0e3cd8d /source/blender
parent5a6261afb32bbc5ed22ebfb347d28743532e5a19 (diff)
Correctly detect and use modal keymaps in macros
Diffstat (limited to 'source/blender')
-rw-r--r--source/blender/windowmanager/intern/wm_event_system.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/source/blender/windowmanager/intern/wm_event_system.c b/source/blender/windowmanager/intern/wm_event_system.c
index 42c65a8a8d7..d8c0e9daf46 100644
--- a/source/blender/windowmanager/intern/wm_event_system.c
+++ b/source/blender/windowmanager/intern/wm_event_system.c
@@ -807,6 +807,10 @@ static int wm_event_always_pass(wmEvent *event)
/* operator exists */
static void wm_event_modalkeymap(const bContext *C, wmOperator *op, wmEvent *event)
{
+ /* support for modal keymap in macros */
+ if (op->opm)
+ op = op->opm;
+
if(op->type->modalkeymap) {
wmKeyMap *keymap= WM_keymap_active(CTX_wm_manager(C), op->type->modalkeymap);
wmKeyMapItem *kmi;