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:
authorJulian Eisel <eiseljulian@gmail.com>2017-03-02 21:15:32 +0300
committerJulian Eisel <eiseljulian@gmail.com>2017-03-02 21:15:32 +0300
commita99495d2914088174ce0900b9360660a41d74c42 (patch)
tree0f7f2f167ceb7250aebfe76d821de0bb60c8e20f /release/scripts/presets
parent5ce6388f7c2a7fed483ae3ff187063f94f139e94 (diff)
parent42cb93205c0fc33185e56239d1dc21f0a6230e54 (diff)
Merge branch 'master' into blender2.8
Conflicts: source/blender/blenkernel/intern/scene.c
Diffstat (limited to 'release/scripts/presets')
-rw-r--r--release/scripts/presets/keyconfig/maya.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/release/scripts/presets/keyconfig/maya.py b/release/scripts/presets/keyconfig/maya.py
index f542ecf810b..3f4754863c6 100644
--- a/release/scripts/presets/keyconfig/maya.py
+++ b/release/scripts/presets/keyconfig/maya.py
@@ -932,6 +932,9 @@ km = kc.keymaps.new('3D View', space_type='VIEW_3D', region_type='WINDOW', modal
kmi = km.keymap_items.new('view3d.cursor3d', 'ACTIONMOUSE', 'PRESS')
kmi = km.keymap_items.new('view3d.rotate', 'LEFTMOUSE', 'PRESS', alt=True)
+kmi = km.keymap_items.new('view3d.manipulator', 'LEFTMOUSE', 'PRESS', shift=True)
+kmi.properties.release_confirm = True
+kmi.properties.use_planar_constraint = True
kmi = km.keymap_items.new('view3d.manipulator', 'LEFTMOUSE', 'PRESS', any=True)
kmi.properties.release_confirm = True
kmi = km.keymap_items.new('view3d.move', 'MIDDLEMOUSE', 'PRESS', alt=True)