Commit: fdb12ff564daefc20829ebe37edf76788530bef6
Author: Bastien Montagne
Date: Sat Sep 13 15:49:53 2014 +0200
Branches: master
https://developer.blender.org/rBfdb12ff564daefc20829ebe37edf76788530bef6
Fix T41811: unreachable code in wm_keymap.c
There was also an issue with passing sl->spacetype here, for some reason...
===================================================================
M source/blender/windowmanager/intern/wm_keymap.c
===================================================================
diff --git a/source/blender/windowmanager/intern/wm_keymap.c
b/source/blender/windowmanager/intern/wm_keymap.c
index 7b56714..f2eaa8d 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);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
