forked from bartvdbraak/blender
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.
This commit is contained in:
parent
97e9bb9488
commit
b5c50c02fa
@ -898,19 +898,19 @@ class IMAGE_PT_tools_brush_appearance(BrushButtonsPanel, Panel):
|
|||||||
layout.label(text="Brush Unset")
|
layout.label(text="Brush Unset")
|
||||||
return
|
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 = 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")
|
col.prop(brush, "use_custom_icon")
|
||||||
if brush.use_custom_icon:
|
sub = col.column()
|
||||||
col.prop(brush, "icon_filepath", text="")
|
sub.active = brush.use_custom_icon
|
||||||
|
sub.prop(brush, "icon_filepath", text="")
|
||||||
|
|
||||||
|
|
||||||
class IMAGE_UV_sculpt_curve(Panel):
|
class IMAGE_UV_sculpt_curve(Panel):
|
||||||
|
@ -1316,24 +1316,25 @@ class VIEW3D_PT_tools_brush_appearance(Panel, View3DPaintPanel):
|
|||||||
col = layout.column()
|
col = layout.column()
|
||||||
col.prop(settings, "show_brush")
|
col.prop(settings, "show_brush")
|
||||||
|
|
||||||
col = col.column()
|
sub = col.column()
|
||||||
col.active = settings.show_brush
|
sub.active = settings.show_brush
|
||||||
|
|
||||||
if context.sculpt_object and context.tool_settings.sculpt:
|
if context.sculpt_object and context.tool_settings.sculpt:
|
||||||
if brush.sculpt_capabilities.has_secondary_color:
|
if brush.sculpt_capabilities.has_secondary_color:
|
||||||
col.row().prop(brush, "cursor_color_add", text="Add")
|
sub.row().prop(brush, "cursor_color_add", text="Add")
|
||||||
col.row().prop(brush, "cursor_color_subtract", text="Subtract")
|
sub.row().prop(brush, "cursor_color_subtract", text="Subtract")
|
||||||
else:
|
else:
|
||||||
col.prop(brush, "cursor_color_add", text="")
|
sub.prop(brush, "cursor_color_add", text="")
|
||||||
else:
|
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")
|
col.prop(brush, "use_custom_icon")
|
||||||
if brush.use_custom_icon:
|
sub = col.column()
|
||||||
col.prop(brush, "icon_filepath", text="")
|
sub.active = brush.use_custom_icon
|
||||||
|
sub.prop(brush, "icon_filepath", text="")
|
||||||
|
|
||||||
# ********** default tools for weight-paint ****************
|
# ********** default tools for weight-paint ****************
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user