Blender Git Loki
Git Commits -> Revision 62639a5
Revision 62639a5 by Martin Poirier (master) December 17, 2009, 22:14 (GMT) |
Keymap conflict detection operator. Takes into account the hierarchical structures of keymaps as well as wildcards (KM_ANY) in event definitions, user remaps (emulate numpad, action/select mouse buttons, ...) and event values that overlap (click, press and release) For now, doesn't do anything other than print conflicts in the console. As a result, I cleaned up a lot of keymaps that had double definitions, moved some keymap items in more appropriate places, fixed wrong definitions and removed kmi that were added for testing a long long time ago. Out of all the remaining conflicts, after removing obvious non-issues, here's what remains: http://www.pasteall.org/9898 |
Commit Details:
Full Hash: 62639a55d90f1adc2e18f8d2b7d2556a761ef254
SVN Revision: 25455
Parent Commit: 66c3ae5
Lines Changed: +197, -63
15 Modified Paths:
/release/scripts/ui/space_userpref.py (+130, -29) (Diff)
/source/blender/editors/curve/curve_ops.c (+1, -1) (Diff)
/source/blender/editors/mesh/mesh_ops.c (+2, -12) (Diff)
/source/blender/editors/object/object_ops.c (+2, -3) (Diff)
/source/blender/editors/space_file/space_file.c (+0, -1) (Diff)
/source/blender/editors/space_image/space_image.c (+0, -4) (Diff)
/source/blender/editors/space_text/space_text.c (+2, -5) (Diff)
/source/blender/editors/space_view3d/view3d_ops.c (+0, -2) (Diff)
/source/blender/editors/transform/transform_ops.c (+0, -4) (Diff)
/source/blender/makesrna/intern/rna_internal.h (+1, -0) (Diff)
/source/blender/makesrna/intern/rna_wm.c (+2, -0) (Diff)
/source/blender/makesrna/intern/rna_wm_api.c (+11, -0) (Diff)
/source/blender/windowmanager/intern/wm_event_system.c (+2, -2) (Diff)
/source/blender/windowmanager/intern/wm_keymap.c (+42, -0) (Diff)
/source/blender/windowmanager/WM_api.h (+2, -0) (Diff)
/source/blender/editors/curve/curve_ops.c (+1, -1) (Diff)
/source/blender/editors/mesh/mesh_ops.c (+2, -12) (Diff)
/source/blender/editors/object/object_ops.c (+2, -3) (Diff)
/source/blender/editors/space_file/space_file.c (+0, -1) (Diff)
/source/blender/editors/space_image/space_image.c (+0, -4) (Diff)
/source/blender/editors/space_text/space_text.c (+2, -5) (Diff)
/source/blender/editors/space_view3d/view3d_ops.c (+0, -2) (Diff)
/source/blender/editors/transform/transform_ops.c (+0, -4) (Diff)
/source/blender/makesrna/intern/rna_internal.h (+1, -0) (Diff)
/source/blender/makesrna/intern/rna_wm.c (+2, -0) (Diff)
/source/blender/makesrna/intern/rna_wm_api.c (+11, -0) (Diff)
/source/blender/windowmanager/intern/wm_event_system.c (+2, -2) (Diff)
/source/blender/windowmanager/intern/wm_keymap.c (+42, -0) (Diff)
/source/blender/windowmanager/WM_api.h (+2, -0) (Diff)
Master Commits
MiikaH:n Sivut a.k.a. MiikaHweb | 2003-2021