From 6fe7bdde2c9984549abc64b9d104280ec5d748f6 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 10 Apr 2019 10:22:51 +0200 Subject: De-duplicate code --- release/scripts/presets/keyconfig/industry_compatible.py | 16 ++++------------ .../keyconfig/keymap_data/industry_compatible_data.py | 6 +++--- 2 files changed, 7 insertions(+), 15 deletions(-) diff --git a/release/scripts/presets/keyconfig/industry_compatible.py b/release/scripts/presets/keyconfig/industry_compatible.py index 5ccaedd6031..8e8c793e45c 100644 --- a/release/scripts/presets/keyconfig/industry_compatible.py +++ b/release/scripts/presets/keyconfig/industry_compatible.py @@ -11,10 +11,10 @@ class IC_KEYMAP_OT_mesh_select_mode(bpy.types.Operator): bl_label = "Switch to Vertex, Edge or Face Mode from any mode" bl_options = {'UNDO'} - mode: bpy.props.EnumProperty( + type: bpy.props.EnumProperty( name="Mode", items=( - ('VERTEX', "Vertex", "Switcth to Vertex Mode From any Mode"), + ('VERT', "Vertex", "Switcth to Vertex Mode From any Mode"), ('EDGE', "Edge", "Switcth to Edge Mode From any Mode"), ('FACE', "Face", "Switcth to Face Mode From any Mode"), ), @@ -25,16 +25,8 @@ class IC_KEYMAP_OT_mesh_select_mode(bpy.types.Operator): return (context.active_object is not None) and (context.object.type == 'MESH') def execute(self, context): - - if self.mode == "VERTEX": - bpy.ops.object.mode_set(mode='EDIT') - bpy.ops.mesh.select_mode(type='VERT') - elif self.mode == "EDGE": - bpy.ops.object.mode_set(mode='EDIT') - bpy.ops.mesh.select_mode(type='EDGE') - elif self.mode == "FACE": - bpy.ops.object.mode_set(mode='EDIT') - bpy.ops.mesh.select_mode(type='FACE') + bpy.ops.object.mode_set(mode='EDIT') + bpy.ops.mesh.select_mode(type=self.type) return{'FINISHED'} diff --git a/release/scripts/presets/keyconfig/keymap_data/industry_compatible_data.py b/release/scripts/presets/keyconfig/keymap_data/industry_compatible_data.py index 72d8633ea5d..d9abf5cbd85 100644 --- a/release/scripts/presets/keyconfig/keymap_data/industry_compatible_data.py +++ b/release/scripts/presets/keyconfig/keymap_data/industry_compatible_data.py @@ -3388,11 +3388,11 @@ def km_object_non_modal(params): ("object.mode_set",{"type": 'ONE', "value": 'PRESS'}, {"properties": [("mode", 'OBJECT')]}), ("ic_keymap.mesh_select_mode",{"type": 'TWO', "value": 'PRESS'}, - {"properties": [("mode", 'VERTEX')]}), + {"properties": [("type", 'VERTEX')]}), ("ic_keymap.mesh_select_mode",{"type": 'THREE', "value": 'PRESS'}, - {"properties": [("mode", 'EDGE')]}), + {"properties": [("type", 'EDGE')]}), ("ic_keymap.mesh_select_mode",{"type": 'FOUR', "value": 'PRESS'}, - {"properties": [("mode", 'FACE')]}), + {"properties": [("type", 'FACE')]}), ("object.mode_set",{"type": 'TWO', "value": 'PRESS'}, {"properties": [("mode", 'EDIT')]}), ("object.mode_set",{"type": 'FIVE', "value": 'PRESS'}, -- cgit v1.2.3