diff options
author | Thomas Dinges <blender@dingto.org> | 2014-02-25 00:13:05 +0400 |
---|---|---|
committer | Thomas Dinges <blender@dingto.org> | 2014-02-25 00:13:30 +0400 |
commit | b5c50c02fa171c94f59469de93dd0f4dd0a72bbb (patch) | |
tree | 12795ecf95eab75511ca8e85918c7cc24f1d2389 /release | |
parent | 97e9bb94888e902cf78063098d45ad175159f802 (diff) |
Paint UI: Don't hide the custom icon path, just grey out.
This is what we do with boolean and sub-settings. We usually hide it when the options depend on a menu-enum.
Diffstat (limited to 'release')
-rw-r--r-- | release/scripts/startup/bl_ui/space_image.py | 18 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/space_view3d_toolbar.py | 21 |
2 files changed, 20 insertions, 19 deletions
diff --git a/release/scripts/startup/bl_ui/space_image.py b/release/scripts/startup/bl_ui/space_image.py index 3571759aa1f..fce924484b3 100644 --- a/release/scripts/startup/bl_ui/space_image.py +++ b/release/scripts/startup/bl_ui/space_image.py @@ -898,19 +898,19 @@ class IMAGE_PT_tools_brush_appearance(BrushButtonsPanel, Panel): layout.label(text="Brush Unset") return - col = layout.column() - col.prop(toolsettings, "show_brush") + col = layout.column(align=True) - col = col.column() - col.prop(brush, "cursor_color_add", text="") - col.active = toolsettings.show_brush + col.prop(toolsettings, "show_brush") + sub = col.column() + sub.active = toolsettings.show_brush + sub.prop(brush, "cursor_color_add", text="") - layout.separator() + col.separator() - col = layout.column(align=True) col.prop(brush, "use_custom_icon") - if brush.use_custom_icon: - col.prop(brush, "icon_filepath", text="") + sub = col.column() + sub.active = brush.use_custom_icon + sub.prop(brush, "icon_filepath", text="") class IMAGE_UV_sculpt_curve(Panel): diff --git a/release/scripts/startup/bl_ui/space_view3d_toolbar.py b/release/scripts/startup/bl_ui/space_view3d_toolbar.py index b7e0cc5235d..2081a7cf4f2 100644 --- a/release/scripts/startup/bl_ui/space_view3d_toolbar.py +++ b/release/scripts/startup/bl_ui/space_view3d_toolbar.py @@ -1316,24 +1316,25 @@ class VIEW3D_PT_tools_brush_appearance(Panel, View3DPaintPanel): col = layout.column() col.prop(settings, "show_brush") - col = col.column() - col.active = settings.show_brush + sub = col.column() + sub.active = settings.show_brush if context.sculpt_object and context.tool_settings.sculpt: if brush.sculpt_capabilities.has_secondary_color: - col.row().prop(brush, "cursor_color_add", text="Add") - col.row().prop(brush, "cursor_color_subtract", text="Subtract") + sub.row().prop(brush, "cursor_color_add", text="Add") + sub.row().prop(brush, "cursor_color_subtract", text="Subtract") else: - col.prop(brush, "cursor_color_add", text="") + sub.prop(brush, "cursor_color_add", text="") else: - col.prop(brush, "cursor_color_add", text="") + sub.prop(brush, "cursor_color_add", text="") - layout.separator() + col.separator() - col = layout.column(align=True) + col = col.column(align=True) col.prop(brush, "use_custom_icon") - if brush.use_custom_icon: - col.prop(brush, "icon_filepath", text="") + sub = col.column() + sub.active = brush.use_custom_icon + sub.prop(brush, "icon_filepath", text="") # ********** default tools for weight-paint **************** |