diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-04-30 11:34:23 +0400 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-04-30 11:34:23 +0400 |
commit | 39ac11a3026c8bbdb90f48fc3b1a92d2808eb789 (patch) | |
tree | 911a6db325185b5a8e69e33d16944f47e7835c7e /release | |
parent | 6b974ad0f11f55468220e0f1c616130b0a772950 (diff) |
Partial fix for #35108: Shortcuts 3dsmax Blender 2.67RC
Made keyap use the same select_or_deselect_all operator
as used for maya keymap instead of tricks with deselect_all.
Solves issue with selection in editor mode (reported as #3
in the original bug report).
Diffstat (limited to 'release')
-rw-r--r-- | release/scripts/presets/keyconfig/3dsmax.py | 30 | ||||
-rw-r--r-- | release/scripts/startup/bl_operators/view3d.py | 2 |
2 files changed, 9 insertions, 23 deletions
diff --git a/release/scripts/presets/keyconfig/3dsmax.py b/release/scripts/presets/keyconfig/3dsmax.py index b8e18c2024f..bef436de87e 100644 --- a/release/scripts/presets/keyconfig/3dsmax.py +++ b/release/scripts/presets/keyconfig/3dsmax.py @@ -171,56 +171,56 @@ kmi = km.keymap_items.new('wm.context_toggle_enum', 'Z', 'PRESS', alt=True) kmi.properties.data_path = 'space_data.viewport_shade' kmi.properties.value_1 = 'SOLID' kmi.properties.value_2 = 'TEXTURED' -kmi = km.keymap_items.new('view3d.select', 'SELECTMOUSE', 'RELEASE') +kmi = km.keymap_items.new('view3d.select_or_deselect_all', 'SELECTMOUSE', 'CLICK') kmi.properties.extend = False kmi.properties.deselect = False kmi.properties.toggle = False kmi.properties.center = False kmi.properties.enumerate = False kmi.properties.object = False -kmi = km.keymap_items.new('view3d.select', 'SELECTMOUSE', 'RELEASE', ctrl=True) +kmi = km.keymap_items.new('view3d.select_or_deselect_all', 'SELECTMOUSE', 'CLICK', ctrl=True) kmi.properties.extend = False kmi.properties.deselect = False kmi.properties.toggle = True kmi.properties.center = False kmi.properties.enumerate = False kmi.properties.object = False -kmi = km.keymap_items.new('view3d.select', 'SELECTMOUSE', 'PRESS', shift=True) +kmi = km.keymap_items.new('view3d.select_or_deselect_all', 'SELECTMOUSE', 'CLICK', shift=True) kmi.properties.extend = False kmi.properties.deselect = False kmi.properties.toggle = False kmi.properties.center = True kmi.properties.enumerate = False kmi.properties.object = True -kmi = km.keymap_items.new('view3d.select', 'SELECTMOUSE', 'RELEASE', alt=True) +kmi = km.keymap_items.new('view3d.select_or_deselect_all', 'SELECTMOUSE', 'CLICK', alt=True) kmi.properties.extend = False kmi.properties.deselect = False kmi.properties.toggle = False kmi.properties.center = False kmi.properties.enumerate = True kmi.properties.object = False -kmi = km.keymap_items.new('view3d.select', 'SELECTMOUSE', 'RELEASE', shift=True, ctrl=True) +kmi = km.keymap_items.new('view3d.select_or_deselect_all', 'SELECTMOUSE', 'CLICK', shift=True, ctrl=True) kmi.properties.extend = True kmi.properties.deselect = False kmi.properties.toggle = True kmi.properties.center = True kmi.properties.enumerate = False kmi.properties.object = False -kmi = km.keymap_items.new('view3d.select', 'SELECTMOUSE', 'RELEASE', ctrl=True, alt=True) +kmi = km.keymap_items.new('view3d.select_or_deselect_all', 'SELECTMOUSE', 'CLICK', ctrl=True, alt=True) kmi.properties.extend = False kmi.properties.deselect = False kmi.properties.toggle = False kmi.properties.center = True kmi.properties.enumerate = True kmi.properties.object = False -kmi = km.keymap_items.new('view3d.select', 'SELECTMOUSE', 'RELEASE', shift=True, alt=True) +kmi = km.keymap_items.new('view3d.select_or_deselect_all', 'SELECTMOUSE', 'CLICK', shift=True, alt=True) kmi.properties.extend = False kmi.properties.deselect = False kmi.properties.toggle = True kmi.properties.center = False kmi.properties.enumerate = True kmi.properties.object = False -kmi = km.keymap_items.new('view3d.select', 'SELECTMOUSE', 'RELEASE', shift=True, ctrl=True, alt=True) +kmi = km.keymap_items.new('view3d.select_or_deselect_all', 'SELECTMOUSE', 'CLICK', shift=True, ctrl=True, alt=True) kmi.properties.extend = False kmi.properties.deselect = False kmi.properties.toggle = True @@ -345,8 +345,6 @@ kmi = km.keymap_items.new('pose.paste', 'V', 'PRESS', ctrl=True) kmi.properties.flipped = False kmi = km.keymap_items.new('pose.paste', 'V', 'PRESS', shift=True, ctrl=True) kmi.properties.flipped = True -kmi = km.keymap_items.new('pose.select_all', 'LEFTMOUSE', 'CLICK') -kmi.properties.action = 'TOGGLE' kmi = km.keymap_items.new('pose.select_all', 'I', 'PRESS', ctrl=True) kmi.properties.action = 'INVERT' kmi = km.keymap_items.new('pose.select_parent', 'P', 'PRESS', shift=True) @@ -403,8 +401,6 @@ kmi.properties.data_path = 'tool_settings.proportional_edit_falloff' kmi = km.keymap_items.new('wm.context_toggle', 'O', 'PRESS') kmi.properties.data_path = 'tool_settings.use_proportional_edit_objects' kmi = km.keymap_items.new('view3d.game_start', 'P', 'PRESS') -kmi = km.keymap_items.new('object.select_all', 'LEFTMOUSE', 'CLICK') -kmi.properties.action = 'DESELECT' kmi = km.keymap_items.new('object.select_all', 'I', 'PRESS', ctrl=True) kmi.properties.action = 'INVERT' kmi = km.keymap_items.new('object.select_linked', 'L', 'PRESS', shift=True) @@ -1021,8 +1017,6 @@ kmi.properties.extend = False kmi.properties.deselect = False kmi.properties.toggle = True kmi = km.keymap_items.new('mesh.select_shortest_path', 'SELECTMOUSE', 'PRESS', ctrl=True) -kmi = km.keymap_items.new('mesh.select_all', 'LEFTMOUSE', 'CLICK') -kmi.properties.action = 'DESELECT' kmi = km.keymap_items.new('mesh.select_all', 'I', 'PRESS', ctrl=True) kmi.properties.action = 'INVERT' kmi = km.keymap_items.new('mesh.select_more', 'NUMPAD_PLUS', 'PRESS', ctrl=True) @@ -1138,8 +1132,6 @@ kmi = km.keymap_items.new('wm.call_menu', 'A', 'PRESS', shift=True) kmi.properties.name = 'INFO_MT_edit_curve_add' kmi = km.keymap_items.new('curve.handle_type_set', 'V', 'PRESS') kmi = km.keymap_items.new('curve.vertex_add', 'LEFTMOUSE', 'CLICK', ctrl=True) -kmi = km.keymap_items.new('curve.select_all', 'LEFTMOUSE', 'CLICK') -kmi.properties.action = 'TOGGLE' kmi = km.keymap_items.new('curve.select_all', 'I', 'PRESS', ctrl=True) kmi.properties.action = 'INVERT' kmi = km.keymap_items.new('curve.select_row', 'R', 'PRESS', shift=True) @@ -1207,8 +1199,6 @@ kmi = km.keymap_items.new('armature.switch_direction', 'F', 'PRESS', alt=True) kmi = km.keymap_items.new('armature.bone_primitive_add', 'A', 'PRESS', shift=True) kmi = km.keymap_items.new('armature.parent_set', 'P', 'PRESS', ctrl=True) kmi = km.keymap_items.new('armature.parent_clear', 'P', 'PRESS', alt=True) -kmi = km.keymap_items.new('armature.select_all', 'LEFTMOUSE', 'CLICK') -kmi.properties.action = 'TOGGLE' kmi = km.keymap_items.new('armature.select_all', 'I', 'PRESS', ctrl=True) kmi.properties.action = 'INVERT' kmi = km.keymap_items.new('armature.select_hierarchy', 'LEFT_BRACKET', 'PRESS') @@ -1262,8 +1252,6 @@ kmi.properties.unselected = True kmi = km.keymap_items.new('mball.delete_metaelems', 'X', 'PRESS') kmi = km.keymap_items.new('mball.delete_metaelems', 'DEL', 'PRESS') kmi = km.keymap_items.new('mball.duplicate_metaelems', 'D', 'PRESS', shift=True) -kmi = km.keymap_items.new('mball.select_all', 'LEFTMOUSE', 'CLICK') -kmi.properties.action = 'TOGGLE' kmi = km.keymap_items.new('mball.select_all', 'I', 'PRESS', ctrl=True) kmi.properties.action = 'INVERT' kmi = km.keymap_items.new('wm.context_cycle_enum', 'O', 'PRESS', shift=True) @@ -1280,8 +1268,6 @@ kmi.properties.value_2 = 'CONNECTED' # Map Lattice km = kc.keymaps.new('Lattice', space_type='EMPTY', region_type='WINDOW', modal=False) -kmi = km.keymap_items.new('lattice.select_all', 'LEFTMOUSE', 'CLICK') -kmi.properties.action = 'TOGGLE' kmi = km.keymap_items.new('lattice.select_all', 'I', 'PRESS', ctrl=True) kmi.properties.action = 'INVERT' kmi = km.keymap_items.new('object.vertex_parent_set', 'P', 'PRESS', ctrl=True) diff --git a/release/scripts/startup/bl_operators/view3d.py b/release/scripts/startup/bl_operators/view3d.py index 8d5785cc55b..98c4258c565 100644 --- a/release/scripts/startup/bl_operators/view3d.py +++ b/release/scripts/startup/bl_operators/view3d.py @@ -137,7 +137,7 @@ class VIEW3D_OT_select_or_deselect_all(Operator): x = event.mouse_region_x y = event.mouse_region_y - if self.extend == False: + if self.extend == False and self.toggle == False: active_object = context.active_object if active_object: |