From bed447b244ac949807baa27b61d00d45b547e5c9 Mon Sep 17 00:00:00 2001 From: Antony Riakiotakis Date: Thu, 5 Sep 2013 13:15:29 +0000 Subject: Tidy up paint options, patch by Sebastian Koenig, with minor changes (ommit texture paint changes, they made the interface more difficult to discern). Also, move stroke input samples to stroke panel --- .../startup/bl_ui/properties_paint_common.py | 5 ++-- .../scripts/startup/bl_ui/space_view3d_toolbar.py | 30 +++++++++++----------- 2 files changed, 18 insertions(+), 17 deletions(-) (limited to 'release') diff --git a/release/scripts/startup/bl_ui/properties_paint_common.py b/release/scripts/startup/bl_ui/properties_paint_common.py index b3335f32231..5995b765ae6 100644 --- a/release/scripts/startup/bl_ui/properties_paint_common.py +++ b/release/scripts/startup/bl_ui/properties_paint_common.py @@ -45,8 +45,9 @@ class UnifiedPaintPanel(): def unified_paint_settings(parent, context): ups = context.tool_settings.unified_paint_settings parent.label(text="Unified Settings:") - parent.prop(ups, "use_unified_size", text="Size") - parent.prop(ups, "use_unified_strength", text="Strength") + row = parent.row() + row.prop(ups, "use_unified_size", text="Size") + row.prop(ups, "use_unified_strength", text="Strength") if context.weight_paint_object: parent.prop(ups, "use_unified_weight", text="Weight") diff --git a/release/scripts/startup/bl_ui/space_view3d_toolbar.py b/release/scripts/startup/bl_ui/space_view3d_toolbar.py index b3f139e5377..c40b9807f20 100644 --- a/release/scripts/startup/bl_ui/space_view3d_toolbar.py +++ b/release/scripts/startup/bl_ui/space_view3d_toolbar.py @@ -913,6 +913,7 @@ class VIEW3D_PT_tools_brush_stroke(Panel, View3DPaintPanel): row.prop(brush, "use_relative_jitter", text="", icon='UNLOCKED') row.prop(brush, "jitter_absolute") row.prop(brush, "use_pressure_jitter", toggle=True, text="") + if brush.sculpt_capabilities.has_smooth_stroke: col = layout.column() col.separator() @@ -944,6 +945,9 @@ class VIEW3D_PT_tools_brush_stroke(Panel, View3DPaintPanel): sub.active = brush.use_smooth_stroke sub.prop(brush, "smooth_stroke_radius", text="Radius", slider=True) sub.prop(brush, "smooth_stroke_factor", text="Factor", slider=True) + + layout.prop(settings, "input_samples") + class VIEW3D_PT_tools_brush_curve(Panel, View3DPaintPanel): @@ -1028,8 +1032,6 @@ class VIEW3D_PT_sculpt_options(Panel, View3DPaintPanel): layout.prop(sculpt, "use_deform_only") layout.prop(sculpt, "show_diffuse_color") - layout.prop(sculpt, "input_samples") - self.unified_paint_settings(layout, context) @@ -1136,11 +1138,14 @@ class VIEW3D_PT_tools_weightpaint_options(Panel, View3DPaintPanel): wpaint = tool_settings.weight_paint col = layout.column() + row = col.row() - col.prop(wpaint, "use_all_faces") - col.prop(wpaint, "use_normal") - col.prop(wpaint, "use_spray") - col.prop(wpaint, "use_group_restrict") + row.prop(wpaint, "use_all_faces") + row.prop(wpaint, "use_normal") + col = layout.column() + row = col.row() + row.prop(wpaint, "use_spray") + row.prop(wpaint, "use_group_restrict") obj = context.weight_paint_object if obj.type == 'MESH': @@ -1150,8 +1155,6 @@ class VIEW3D_PT_tools_weightpaint_options(Panel, View3DPaintPanel): row.active = mesh.use_mirror_x row.prop(mesh, "use_mirror_topology") - col.prop(wpaint, "input_samples") - col.label("Show Zero Weights:") sub = col.row() sub.active = (not tool_settings.use_multipaint) @@ -1173,13 +1176,12 @@ class VIEW3D_PT_tools_vertexpaint(Panel, View3DPaintPanel): vpaint = toolsettings.vertex_paint col = layout.column() + row = col.row() #col.prop(vpaint, "mode", text="") - col.prop(vpaint, "use_all_faces") - col.prop(vpaint, "use_normal") + row.prop(vpaint, "use_all_faces") + row.prop(vpaint, "use_normal") col.prop(vpaint, "use_spray") - col.prop(vpaint, "input_samples") - self.unified_paint_settings(col, context) # Commented out because the Apply button isn't an operator yet, making these settings useless @@ -1209,15 +1211,13 @@ class VIEW3D_PT_tools_projectpaint(View3DPanel, Panel): ipaint = toolsettings.image_paint settings = toolsettings.image_paint - layout.prop(ipaint, "input_samples") - col = layout.column() col.prop(ipaint, "use_occlude") col.prop(ipaint, "use_backface_culling") row = layout.row() row.prop(ipaint, "use_normal_falloff") - + sub = row.row() sub.active = (ipaint.use_normal_falloff) sub.prop(ipaint, "normal_angle", text="") -- cgit v1.2.3