diff options
author | Antonio Vazquez <blendergit@gmail.com> | 2020-08-21 10:48:45 +0300 |
---|---|---|
committer | Antonio Vazquez <blendergit@gmail.com> | 2020-08-21 10:48:45 +0300 |
commit | 96a690c7ac7f34b3a42145c1d030d62164e22668 (patch) | |
tree | ffc6aead22c77cbcdf27135812ea6653f4821e96 /release/scripts/startup | |
parent | 585089cdb6521915d760c59572eeadbf59b0d833 (diff) | |
parent | 41d31e100d9d76aa8f20bd9fe8429122828dc7a9 (diff) |
Merge branch 'master' into greasepencil-edit-curve
Diffstat (limited to 'release/scripts/startup')
-rw-r--r-- | release/scripts/startup/bl_ui/space_toolsystem_toolbar.py | 1 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/space_view3d.py | 12 |
2 files changed, 11 insertions, 2 deletions
diff --git a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py index 1bc6d5cf71f..e336635a4ee 100644 --- a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py +++ b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py @@ -1289,6 +1289,7 @@ class _defs_sculpt: layout.prop(props, "strength") row = layout.row(align=True) row.prop(props, "force_axis") + layout.prop(props, "orientation", expand=False) layout.prop(props, "cloth_mass") layout.prop(props, "cloth_damping") layout.prop(props, "use_face_sets") diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py index 321c3814dba..1e320e2048f 100644 --- a/release/scripts/startup/bl_ui/space_view3d.py +++ b/release/scripts/startup/bl_ui/space_view3d.py @@ -5958,7 +5958,7 @@ class VIEW3D_PT_gizmo_display(Panel): layout.separator() col = layout.column() - col.active = view.show_gizmo_context + col.active = view.show_gizmo and view.show_gizmo_context col.label(text="Object Gizmos") col.prop(scene.transform_orientation_slots[1], "type", text="") col.prop(view, "show_gizmo_object_translate", text="Move") @@ -5969,6 +5969,7 @@ class VIEW3D_PT_gizmo_display(Panel): # Match order of object type visibility col = layout.column() + col.active = view.show_gizmo col.label(text="Empty") col.prop(view, "show_gizmo_empty_image", text="Image") col.prop(view, "show_gizmo_empty_force_field", text="Force Field") @@ -6127,8 +6128,12 @@ class VIEW3D_PT_overlay_motion_tracking(Panel): bl_label = "Motion Tracking" def draw_header(self, context): + layout = self.layout view = context.space_data - self.layout.prop(view, "show_reconstruction", text=self.bl_label) + overlay = view.overlay + display_all = overlay.show_overlays + layout.active = display_all + layout.prop(view, "show_reconstruction", text=self.bl_label) def draw(self, context): layout = self.layout @@ -6150,6 +6155,7 @@ class VIEW3D_PT_overlay_motion_tracking(Panel): sub.prop(view, "show_bundle_names", text="Marker Names") col = layout.column() + col.active = display_all col.label(text="Tracks:") row = col.row(align=True) row.prop(view, "tracks_display_type", text="") @@ -6585,6 +6591,8 @@ class VIEW3D_PT_proportional_edit(Panel): layout = self.layout tool_settings = context.tool_settings col = layout.column() + col.active = (tool_settings.use_proportional_edit_objects if context.mode == 'OBJECT' + else tool_settings.use_proportional_edit) if context.mode != 'OBJECT': col.prop(tool_settings, "use_proportional_connected") |