diff options
| author | Julian Eisel <eiseljulian@gmail.com> | 2017-03-02 21:15:32 +0300 |
|---|---|---|
| committer | Julian Eisel <eiseljulian@gmail.com> | 2017-03-02 21:15:32 +0300 |
| commit | a99495d2914088174ce0900b9360660a41d74c42 (patch) | |
| tree | 0f7f2f167ceb7250aebfe76d821de0bb60c8e20f /release | |
| parent | 5ce6388f7c2a7fed483ae3ff187063f94f139e94 (diff) | |
| parent | 42cb93205c0fc33185e56239d1dc21f0a6230e54 (diff) | |
Merge branch 'master' into blender2.8
Conflicts:
source/blender/blenkernel/intern/scene.c
Diffstat (limited to 'release')
| -rw-r--r-- | release/scripts/presets/keyconfig/maya.py | 3 | ||||
| -rw-r--r-- | release/scripts/startup/bl_ui/properties_data_modifier.py | 7 | ||||
| -rw-r--r-- | release/scripts/startup/bl_ui/space_sequencer.py | 6 |
3 files changed, 11 insertions, 5 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) diff --git a/release/scripts/startup/bl_ui/properties_data_modifier.py b/release/scripts/startup/bl_ui/properties_data_modifier.py index d62c20d4589..68b6265ab15 100644 --- a/release/scripts/startup/bl_ui/properties_data_modifier.py +++ b/release/scripts/startup/bl_ui/properties_data_modifier.py @@ -960,10 +960,13 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel): layout.separator() + col = layout.column() + col.active = md.target is not None + if md.is_bound: - layout.operator("object.surfacedeform_bind", text="Unbind") + col.operator("object.surfacedeform_bind", text="Unbind") else: - layout.operator("object.surfacedeform_bind", text="Bind") + col.operator("object.surfacedeform_bind", text="Bind") def UV_PROJECT(self, layout, ob, md): split = layout.split() diff --git a/release/scripts/startup/bl_ui/space_sequencer.py b/release/scripts/startup/bl_ui/space_sequencer.py index 23697c5e5eb..67ffaa7fccf 100644 --- a/release/scripts/startup/bl_ui/space_sequencer.py +++ b/release/scripts/startup/bl_ui/space_sequencer.py @@ -668,14 +668,14 @@ class SEQUENCER_PT_effect(SequencerButtonsPanel, Panel): if (i % BT_ROW) == 1: row = col.row(align=True) - # Workaround - .active has to have a separate UI block to work + # Workaround - .enabled has to have a separate UI block to work if i == strip.multicam_source: sub = row.row(align=True) - sub.active = False + sub.enabled = False sub.operator("sequencer.cut_multicam", text="%d" % i).camera = i else: sub_1 = row.row(align=True) - sub_1.active = True + sub_1.enabled = True sub_1.operator("sequencer.cut_multicam", text="%d" % i).camera = i if strip.channel > BT_ROW and (strip_channel - 1) % BT_ROW: |