kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Paint UI: Don't hide the custom icon path, just grey out.

Browse Source 
This is what we do with boolean and sub-settings. We usually hide it when the options depend on a menu-enum.
This commit is contained in:
Thomas Dinges 2014-02-24 21:13:05 +01:00
parent 97e9bb9488
commit b5c50c02fa
2 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
release/scripts/startup/bl_ui/space_image.py
View File

@ -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 = col.column()
col.prop(brush, "cursor_color_add", text="")
col.active = toolsettings.show_brush
layout.separator()
col = layout.column(align=True)
col.prop(toolsettings, "show_brush")
sub = col.column()
sub.active = toolsettings.show_brush
sub.prop(brush, "cursor_color_add", text="")
col.separator()
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):

21
release/scripts/startup/bl_ui/space_view3d_toolbar.py
View File

@ -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 ****************