diff options
| author | Antonio Vazquez <blendergit@gmail.com> | 2020-09-03 09:22:05 +0300 |
|---|---|---|
| committer | Antonio Vazquez <blendergit@gmail.com> | 2020-09-03 09:22:05 +0300 |
| commit | c50ead08855f6b3e1944cf7c01144918a78d24ea (patch) | |
| tree | a098635aa2c9353d715ce2b874a69aea588548ab /release/scripts/startup/bl_ui | |
| parent | 7c91f3f3a9ada4c796d6121efa89a3b6842a773a (diff) | |
| parent | c017e1cb676314690a8c0b7da154a0815024171e (diff) | |
Merge branch 'master' into greasepencil-edit-curve
Diffstat (limited to 'release/scripts/startup/bl_ui')
| -rw-r--r-- | release/scripts/startup/bl_ui/properties_constraint.py | 12 | ||||
| -rw-r--r-- | release/scripts/startup/bl_ui/properties_scene.py | 4 | ||||
| -rw-r--r-- | release/scripts/startup/bl_ui/space_view3d.py | 2 |
3 files changed, 5 insertions, 13 deletions
diff --git a/release/scripts/startup/bl_ui/properties_constraint.py b/release/scripts/startup/bl_ui/properties_constraint.py index b47d4223372..da35ea680b8 100644 --- a/release/scripts/startup/bl_ui/properties_constraint.py +++ b/release/scripts/startup/bl_ui/properties_constraint.py @@ -114,11 +114,7 @@ class ConstraintButtonsPanel(Panel): col.prop_search(con, "subtarget", con.target, "vertex_groups", text="Vertex Group") def get_constraint(self, context): - con = None - if context.pose_bone: - con = context.pose_bone.constraints[self.list_panel_index] - else: - con = context.object.constraints[self.list_panel_index] + con = self.custom_data self.layout.context_pointer_set("constraint", con) return con @@ -963,11 +959,7 @@ class ConstraintButtonsSubPanel(Panel): bl_options = {'DRAW_BOX'} def get_constraint(self, context): - con = None - if context.pose_bone: - con = context.pose_bone.constraints[self.list_panel_index] - else: - con = context.object.constraints[self.list_panel_index] + con = self.custom_data self.layout.context_pointer_set("constraint", con) return con diff --git a/release/scripts/startup/bl_ui/properties_scene.py b/release/scripts/startup/bl_ui/properties_scene.py index 22f455fe5be..df4793cab19 100644 --- a/release/scripts/startup/bl_ui/properties_scene.py +++ b/release/scripts/startup/bl_ui/properties_scene.py @@ -385,8 +385,8 @@ class SCENE_PT_rigid_body_world_settings(RigidBodySubPanel, Panel): col.prop(rbw, "use_split_impulse") col = col.column() - col.prop(rbw, "steps_per_second", text="Steps Per Second") - col.prop(rbw, "solver_iterations", text="Solver Iterations") + col.prop(rbw, "substeps_per_frame") + col.prop(rbw, "solver_iterations") class SCENE_PT_rigid_body_cache(RigidBodySubPanel, Panel): diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py index 4dee0ddef6a..c31e689f0ae 100644 --- a/release/scripts/startup/bl_ui/space_view3d.py +++ b/release/scripts/startup/bl_ui/space_view3d.py @@ -6516,7 +6516,7 @@ class VIEW3D_PT_overlay_vertex_paint(Panel): col = layout.column() col.active = display_all - col.prop(overlay, "vertex_paint_mode_opacity", text="Opacity") + col.prop(overlay, "vertex_paint_mode_opacity") col.prop(overlay, "show_paint_wire") |