diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2014-09-13 17:49:53 +0400 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2014-09-13 17:49:53 +0400 |
| commit | fdb12ff564daefc20829ebe37edf76788530bef6 (patch) | |
| tree | 9214ab888b4389bf2d72724d6215b97350eaaee0 /source/blender/windowmanager/intern/wm_keymap.c | |
| parent | e5b2e9cdd34f071b059a166bdbbc13eeca6bb4dc (diff) | |
Fix T41811: unreachable code in wm_keymap.c
There was also an issue with passing sl->spacetype here, for some reason...
Diffstat (limited to 'source/blender/windowmanager/intern/wm_keymap.c')
| -rw-r--r-- | source/blender/windowmanager/intern/wm_keymap.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/source/blender/windowmanager/intern/wm_keymap.c b/source/blender/windowmanager/intern/wm_keymap.c index 7b567142979..f2eaa8d50bd 100644 --- a/source/blender/windowmanager/intern/wm_keymap.c +++ b/source/blender/windowmanager/intern/wm_keymap.c @@ -1542,8 +1542,11 @@ wmKeyMap *WM_keymap_guess_opname(const bContext *C, const char *opname) else if (STRPREFIX(opname, "FONT_OT")) { km = WM_keymap_find_all(C, "Font", 0, 0); } + /* Paint Face Mask */ + else if (STRPREFIX(opname, "PAINT_OT_face_select")) { + km = WM_keymap_find_all(C, "Face Mask", 0, 0); + } else if (STRPREFIX(opname, "PAINT_OT")) { - /* check for relevant mode */ switch (CTX_data_mode_enum(C)) { case OB_MODE_WEIGHT_PAINT: @@ -1557,10 +1560,6 @@ wmKeyMap *WM_keymap_guess_opname(const bContext *C, const char *opname) break; } } - /* Paint Face Mask */ - else if (STRPREFIX(opname, "PAINT_OT_face_select")) { - km = WM_keymap_find_all(C, "Face Mask", sl->spacetype, 0); - } /* Timeline */ else if (STRPREFIX(opname, "TIME_OT")) { km = WM_keymap_find_all(C, "Timeline", sl->spacetype, 0); |