Commit: 66d362b464bb61aa3b40f0378f0e1ed8c0f15411
Author: Joseph Eagar
Date: Sat Nov 27 09:02:49 2021 -0800
Branches: sculpt-dev
https://developer.blender.org/rB66d362b464bb61aa3b40f0378f0e1ed8c0f15411
Sculpt-dev: don't show input mapping
settings in sculpt context menu
===================================================================
M release/scripts/startup/bl_ui/properties_paint_common.py
M release/scripts/startup/bl_ui/space_view3d.py
===================================================================
diff --git a/release/scripts/startup/bl_ui/properties_paint_common.py
b/release/scripts/startup/bl_ui/properties_paint_common.py
index 9bc7195b16b..0aa747e2dcc 100644
--- a/release/scripts/startup/bl_ui/properties_paint_common.py
+++ b/release/scripts/startup/bl_ui/properties_paint_common.py
@@ -754,9 +754,9 @@ class UnifiedPaintPanel:
return row
@staticmethod
- def prop_unified_color(parent, context, brush, prop_name, *, text=None):
+ def prop_unified_color(parent, context, brush, prop_name, *, text=None,
show_mappings=None):
if context.mode == 'SCULPT':
- return UnifiedPaintPanel.channel_unified(parent, context, brush,
prop_name, text=text)
+ return UnifiedPaintPanel.channel_unified(parent, context, brush,
prop_name, text=text, show_mappings=show_mappings)
ups = context.tool_settings.unified_paint_settings
prop_owner = ups if ups.use_unified_color else brush
diff --git a/release/scripts/startup/bl_ui/space_view3d.py
b/release/scripts/startup/bl_ui/space_view3d.py
index 18c0f26032e..76b634939c4 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -7449,14 +7449,14 @@ class VIEW3D_PT_sculpt_context_menu(Panel):
if colorch:
split = layout.split(factor=0.1)
- UnifiedPaintPanel.prop_unified_color(split, context, brush,
"color", text="")
+ UnifiedPaintPanel.prop_unified_color(split, context, brush,
"color", text="", show_mappings=False)
UnifiedPaintPanel.prop_unified_color_picker(split, context, brush,
"color", value_slider=True)
for ch in channels:
if ch.idname in textmap:
- UnifiedPaintPanel.channel_unified(layout, context, brush,
ch.idname, ui_editing=False, slider=True, text=textmap[ch.idname])
+ UnifiedPaintPanel.channel_unified(layout, context, brush,
ch.idname, ui_editing=False, slider=True, show_mappings=False,
text=textmap[ch.idname])
else:
- UnifiedPaintPanel.channel_unified(layout, context, brush,
ch.idname, ui_editing=False, slider=True)
+ UnifiedPaintPanel.channel_unified(layout, context, brush,
ch.idname, ui_editing=False, slider=True, show_mappings=False)
return
layout.label(text="-----")
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
