[Bf-blender-cvs] [b5c50c0] master: Paint UI: Don't hide the custom icon path, just grey out.
Thomas Dinges
noreply at git.blender.org
Mon Feb 24 21:13:44 CET 2014
Commit: b5c50c02fa171c94f59469de93dd0f4dd0a72bbb
Author: Thomas Dinges
Date: Mon Feb 24 21:13:05 2014 +0100
https://developer.blender.org/rBb5c50c02fa171c94f59469de93dd0f4dd0a72bbb
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.
===================================================================
M release/scripts/startup/bl_ui/space_image.py
M release/scripts/startup/bl_ui/space_view3d_toolbar.py
===================================================================
diff --git a/release/scripts/startup/bl_ui/space_image.py b/release/scripts/startup/bl_ui/space_image.py
index 3571759..fce9244 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 b7e0cc5..2081a7c 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 ****************
More information about the Bf-blender-cvs
mailing list