Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2013-05-29 20:03:09 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2013-05-29 20:03:09 +0400
commitbcf32407c115753ba1236a37a6a8fed592446d8f (patch)
tree1abf3593496ed0d58eb78b3a802815e2017af017 /release
parent2757153d02a8264013aecc0e56c19d504a966c72 (diff)
Fix #35374: Region overlap + bugs
Was missing keymap for REGION_TIMER, which ended up in missing updates happening. Added this kind of timer to RNA, so keymaps could bind to it. Also made 3ds max keymap working again. Too bad it was broken in 2.67 and 2.67a :S
Diffstat (limited to 'release')
-rw-r--r--release/scripts/presets/keyconfig/3dsmax.py33
-rw-r--r--release/scripts/presets/keyconfig/maya.py1
2 files changed, 8 insertions, 26 deletions
diff --git a/release/scripts/presets/keyconfig/3dsmax.py b/release/scripts/presets/keyconfig/3dsmax.py
index 6c2b64aaf49..592e91d8c24 100644
--- a/release/scripts/presets/keyconfig/3dsmax.py
+++ b/release/scripts/presets/keyconfig/3dsmax.py
@@ -82,7 +82,7 @@ kmi = km.keymap_items.new('info.reports_display_update', 'TIMER_REPORT', 'ANY',
km = kc.keymaps.new('Screen', space_type='EMPTY', region_type='WINDOW', modal=False)
kmi = km.keymap_items.new('screen.animation_step', 'TIMER0', 'ANY', any=True)
-kmi = km.keymap_items.new('screen.region_blend', 'TIMER', 'ANY', any=True)
+kmi = km.keymap_items.new('screen.region_blend', 'TIMER_REGION', 'ANY', any=True)
kmi = km.keymap_items.new('screen.screen_set', 'RIGHT_ARROW', 'PRESS', ctrl=True)
kmi.properties.delta = 1
kmi = km.keymap_items.new('screen.screen_set', 'LEFT_ARROW', 'PRESS', ctrl=True)
@@ -202,7 +202,9 @@ kmi = km.keymap_items.new('paint.face_select_linked_pick', 'L', 'PRESS')
km = kc.keymaps.new('Weight Paint Vertex Selection', space_type='EMPTY', region_type='WINDOW', modal=False)
kmi = km.keymap_items.new('paint.vert_select_all', 'A', 'PRESS', ctrl=True)
-kmi = km.keymap_items.new('paint.vert_select_inverse', 'I', 'PRESS', ctrl=True)
+kmi.properties.action = 'SELECT'
+kmi = km.keymap_items.new('paint.vert_select_all', 'I', 'PRESS', ctrl=True)
+kmi.properties.action = 'INVERT'
kmi = km.keymap_items.new('view3d.select_border', 'B', 'PRESS')
kmi = km.keymap_items.new('view3d.select_lasso', 'EVT_TWEAK_A', 'ANY', ctrl=True)
kmi.properties.deselect = False
@@ -1032,16 +1034,8 @@ kmi = km.keymap_items.new('node.select_lasso', 'EVT_TWEAK_A', 'ANY', shift=True,
kmi.properties.deselect = True
kmi = km.keymap_items.new('node.link', 'LEFTMOUSE', 'PRESS')
kmi.properties.detach = False
-kmi.properties.expose = False
kmi = km.keymap_items.new('node.link', 'LEFTMOUSE', 'PRESS', ctrl=True)
kmi.properties.detach = True
-kmi.properties.expose = False
-kmi = km.keymap_items.new('node.link', 'LEFTMOUSE', 'PRESS', shift=True)
-kmi.properties.detach = False
-kmi.properties.expose = True
-kmi = km.keymap_items.new('node.link', 'LEFTMOUSE', 'PRESS', shift=True, ctrl=True)
-kmi.properties.detach = True
-kmi.properties.expose = True
kmi = km.keymap_items.new('node.resize', 'LEFTMOUSE', 'PRESS')
kmi = km.keymap_items.new('node.add_reroute', 'LEFTMOUSE', 'PRESS', shift=True)
kmi = km.keymap_items.new('node.links_cut', 'LEFTMOUSE', 'PRESS', ctrl=True)
@@ -1088,40 +1082,25 @@ kmi = km.keymap_items.new('node.select_same_type_step', 'LEFT_BRACKET', 'PRESS',
kmi.properties.prev = True
kmi = km.keymap_items.new('node.find_node', 'F', 'PRESS', ctrl=True)
kmi = km.keymap_items.new('node.group_make', 'G', 'PRESS', ctrl=True)
-kmi.properties.node_type = 'ShaderNodeGroup'
kmi = km.keymap_items.new('node.group_ungroup', 'G', 'PRESS', alt=True)
-kmi.properties.node_type = 'ShaderNodeGroup'
kmi = km.keymap_items.new('node.group_separate', 'P', 'PRESS')
-kmi.properties.node_type = 'ShaderNodeGroup'
kmi = km.keymap_items.new('node.group_edit', 'TAB', 'PRESS')
-kmi.properties.node_type = 'ShaderNodeGroup'
kmi.properties.exit = False
kmi = km.keymap_items.new('node.group_edit', 'TAB', 'PRESS', shift=True)
-kmi.properties.node_type = 'ShaderNodeGroup'
kmi.properties.exit = True
kmi = km.keymap_items.new('node.group_make', 'G', 'PRESS', ctrl=True)
-kmi.properties.node_type = 'CompositorNodeGroup'
kmi = km.keymap_items.new('node.group_ungroup', 'G', 'PRESS', alt=True)
-kmi.properties.node_type = 'CompositorNodeGroup'
kmi = km.keymap_items.new('node.group_separate', 'P', 'PRESS')
-kmi.properties.node_type = 'CompositorNodeGroup'
kmi = km.keymap_items.new('node.group_edit', 'TAB', 'PRESS')
-kmi.properties.node_type = 'CompositorNodeGroup'
kmi.properties.exit = False
kmi = km.keymap_items.new('node.group_edit', 'TAB', 'PRESS', shift=True)
-kmi.properties.node_type = 'CompositorNodeGroup'
kmi.properties.exit = True
kmi = km.keymap_items.new('node.group_make', 'G', 'PRESS', ctrl=True)
-kmi.properties.node_type = 'TextureNodeGroup'
kmi = km.keymap_items.new('node.group_ungroup', 'G', 'PRESS', alt=True)
-kmi.properties.node_type = 'TextureNodeGroup'
kmi = km.keymap_items.new('node.group_separate', 'P', 'PRESS')
-kmi.properties.node_type = 'TextureNodeGroup'
kmi = km.keymap_items.new('node.group_edit', 'TAB', 'PRESS')
-kmi.properties.node_type = 'TextureNodeGroup'
kmi.properties.exit = False
kmi = km.keymap_items.new('node.group_edit', 'TAB', 'PRESS', shift=True)
-kmi.properties.node_type = 'TextureNodeGroup'
kmi.properties.exit = True
kmi = km.keymap_items.new('node.read_renderlayers', 'R', 'PRESS', ctrl=True)
kmi = km.keymap_items.new('node.read_fullsamplelayers', 'R', 'PRESS', shift=True)
@@ -1606,9 +1585,11 @@ kmi = km.keymap_items.new('transform.rotate', 'R', 'PRESS')
km = kc.keymaps.new('Image Paint', space_type='EMPTY', region_type='WINDOW', modal=False)
kmi = km.keymap_items.new('paint.image_paint', 'LEFTMOUSE', 'PRESS')
+kmi.properties.mode = 'NORMAL'
+kmi = km.keymap_items.new('paint.image_paint', 'LEFTMOUSE', 'PRESS', ctrl=True)
+kmi.properties.mode = 'INVERT'
kmi = km.keymap_items.new('paint.grab_clone', 'RIGHTMOUSE', 'PRESS')
kmi = km.keymap_items.new('paint.sample_color', 'RIGHTMOUSE', 'PRESS')
-kmi = km.keymap_items.new('paint.clone_cursor_set', 'LEFTMOUSE', 'PRESS', ctrl=True)
kmi = km.keymap_items.new('brush.active_index_set', 'ONE', 'PRESS')
kmi.properties.mode = 'image_paint'
kmi.properties.index = 0
diff --git a/release/scripts/presets/keyconfig/maya.py b/release/scripts/presets/keyconfig/maya.py
index cd399280a32..fbdb6d2832c 100644
--- a/release/scripts/presets/keyconfig/maya.py
+++ b/release/scripts/presets/keyconfig/maya.py
@@ -82,6 +82,7 @@ kmi = km.keymap_items.new('info.reports_display_update', 'TIMER', 'ANY', any=Tru
km = kc.keymaps.new('Screen', space_type='EMPTY', region_type='WINDOW', modal=False)
kmi = km.keymap_items.new('screen.animation_step', 'TIMER0', 'ANY', any=True)
+kmi = km.keymap_items.new('screen.region_blend', 'TIMER_REGION', 'ANY', any=True)
kmi = km.keymap_items.new('screen.screen_set', 'RIGHT_ARROW', 'PRESS', ctrl=True)
kmi.properties.delta = 1
kmi = km.keymap_items.new('screen.screen_set', 'LEFT_ARROW', 'PRESS', ctrl=True)