diff options
author | Antonio Vazquez <blendergit@gmail.com> | 2020-11-07 13:13:53 +0300 |
---|---|---|
committer | Antonio Vazquez <blendergit@gmail.com> | 2020-11-07 13:13:53 +0300 |
commit | c051fd63ff62d027b847d01c0c0ae7f5c8cf7858 (patch) | |
tree | 4877316f39db61277698ea4acdd601eeaa736ad9 /release/scripts | |
parent | 96a0f736a85570fa2d63018be15743e8ef4fe112 (diff) | |
parent | d2c102060d4489aa1fd68f6c33df4ba9c4add78b (diff) |
Merge branch 'master' into greasepencil-edit-curve
Conflicts:
source/blender/blenloader/intern/writefile.c
source/blender/editors/gpencil/gpencil_edit.c
Diffstat (limited to 'release/scripts')
4 files changed, 17 insertions, 4 deletions
diff --git a/release/scripts/presets/keyconfig/keymap_data/blender_default.py b/release/scripts/presets/keyconfig/keymap_data/blender_default.py index dbd588c8e9d..d66d7c45dd4 100644 --- a/release/scripts/presets/keyconfig/keymap_data/blender_default.py +++ b/release/scripts/presets/keyconfig/keymap_data/blender_default.py @@ -5038,7 +5038,7 @@ def km_transform_modal_map(_params): ("AUTOIK_CHAIN_LEN_DOWN", {"type": 'WHEELUPMOUSE', "value": 'PRESS', "shift": True}, None), ("INSERTOFS_TOGGLE_DIR", {"type": 'T', "value": 'PRESS'}, None), ("AUTOCONSTRAIN", {"type": 'MIDDLEMOUSE', "value": 'PRESS'}, None), - ("AUTOCONSTRAINPLANE", {"type": 'MIDDLEMOUSE', "value": 'PRESS'}, None), + ("AUTOCONSTRAINPLANE", {"type": 'MIDDLEMOUSE', "value": 'PRESS', "shift": True}, None), ]) return keymap diff --git a/release/scripts/startup/bl_ui/properties_object.py b/release/scripts/startup/bl_ui/properties_object.py index 4530b4bbe48..7101a78e18f 100644 --- a/release/scripts/startup/bl_ui/properties_object.py +++ b/release/scripts/startup/bl_ui/properties_object.py @@ -141,6 +141,7 @@ class OBJECT_PT_relations(ObjectButtonsPanel, Panel): if parent and ob.parent_type == 'BONE' and parent.type == 'ARMATURE': sub.prop_search(ob, "parent_bone", parent.data, "bones") sub.active = (parent is not None) + sub.prop(ob, "use_camera_lock_parent") col.separator() diff --git a/release/scripts/startup/bl_ui/space_sequencer.py b/release/scripts/startup/bl_ui/space_sequencer.py index 0171fa902db..3f92fce81f6 100644 --- a/release/scripts/startup/bl_ui/space_sequencer.py +++ b/release/scripts/startup/bl_ui/space_sequencer.py @@ -1188,6 +1188,21 @@ class SEQUENCER_PT_effect_text_style(SequencerButtonsPanel, Panel): subsub.prop(strip, "shadow_color", text="") row.prop_decorator(strip, "shadow_color") + row = layout.row(align=True, heading="Box") + row.use_property_decorate = False + sub = row.row(align=True) + sub.prop(strip, "use_box", text="") + subsub = sub.row(align=True) + subsub.active = strip.use_box and (not strip.mute) + subsub.prop(strip, "box_color", text="") + row.prop_decorator(strip, "box_color") + + row = layout.row(align=True, heading="Box Margin") + row.use_property_decorate = False + sub = row.row(align=True) + sub.prop(strip, "box_margin") + sub.active = strip.use_box and (not strip.mute) + class SEQUENCER_PT_source(SequencerButtonsPanel, Panel): bl_label = "Source" diff --git a/release/scripts/startup/bl_ui/space_userpref.py b/release/scripts/startup/bl_ui/space_userpref.py index 1707c21c164..8c1409f00ac 100644 --- a/release/scripts/startup/bl_ui/space_userpref.py +++ b/release/scripts/startup/bl_ui/space_userpref.py @@ -1548,9 +1548,6 @@ class USERPREF_PT_navigation_fly_walk(NavigationPanel, CenterAlignMixIn, Panel): layout.row().prop(inputs, "navigation_mode", expand=True) - flow = layout.grid_flow(row_major=False, columns=0, even_columns=True, even_rows=False, align=False) - flow.prop(inputs, "use_camera_lock_parent") - class USERPREF_PT_navigation_fly_walk_navigation(NavigationPanel, CenterAlignMixIn, Panel): bl_label = "Walk" |