[Bf-blender-cvs] [78d62d9be7e] sculpt-dev: Merge remote-tracking branch 'origin/temp-sculpt-colors' into sculpt-dev
Joseph Eagar
noreply at git.blender.org
Tue Nov 9 06:14:44 CET 2021
Commit: 78d62d9be7e84a2410f759fed3f625845c67ed9a
Author: Joseph Eagar
Date: Mon Nov 8 17:55:19 2021 -0800
Branches: sculpt-dev
https://developer.blender.org/rB78d62d9be7e84a2410f759fed3f625845c67ed9a
Merge remote-tracking branch 'origin/temp-sculpt-colors' into sculpt-dev
This was necassary because sculpt colors is currently broken in master,
and temp-sculpt-colors hasn't been approved for merging to master
yet.
===================================================================
===================================================================
diff --cc release/scripts/startup/bl_ui/properties_data_mesh.py
index 78d501c616c,fbff93dadd4..b074e28fd94
--- a/release/scripts/startup/bl_ui/properties_data_mesh.py
+++ b/release/scripts/startup/bl_ui/properties_data_mesh.py
@@@ -522,9 -476,7 +476,9 @@@ class DATA_PT_remesh(MeshButtonsPanel,
col.prop(mesh, "use_remesh_preserve_volume", text="Volume")
col.prop(mesh, "use_remesh_preserve_paint_mask", text="Paint Mask")
col.prop(mesh, "use_remesh_preserve_sculpt_face_sets", text="Face Sets")
++
+ col.prop(mesh, "use_remesh_preserve_materials", text="Materials")
- if context.preferences.experimental.use_sculpt_vertex_colors:
- col.prop(mesh, "use_remesh_preserve_vertex_colors", text="Vertex Colors")
+ col.prop(mesh, "use_remesh_preserve_vertex_colors", text="Vertex Colors")
col.operator("object.voxel_remesh", text="Voxel Remesh")
else:
diff --cc release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
index 5df7aee574b,09de887bf53..1e4298505c9
--- a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
+++ b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
@@@ -1163,12 -1313,9 +1163,8 @@@ class _defs_sculpt
exclude_filter = {}
# Use 'bpy.context' instead of 'context' since it can be None.
prefs = bpy.context.preferences
- if not prefs.experimental.use_sculpt_vertex_colors:
- exclude_filter = {'PAINT' : True, 'SMEAR' : True}
- if not prefs.experimental.use_sculpt_uvsmooth:
- exclude_filter['UV_SMOOTH'] = True
- return generate_from_enum_ex(
- context,
+ return generate_from_enum_ex(context,
idname_prefix="builtin_brush.",
icon_prefix="brush.sculpt.",
type=bpy.types.Brush,
@@@ -2590,14 -2944,17 +2586,14 @@@ class VIEW3D_PT_tools_active(ToolSelect
None,
_defs_sculpt.mesh_filter,
_defs_sculpt.cloth_filter,
- lambda context: (
- (_defs_sculpt.color_filter,)
+ _defs_sculpt.ipmask_filter,
+ lambda context: ((_defs_sculpt.color_filter,)
- if context is None or (context.preferences.view.show_developer_ui and context.preferences.experimental.use_sculpt_vertex_colors)
+ if context is None
- else ()
- ),
+ else ()),
None,
- lambda context: (
- (_defs_sculpt.mask_by_color,)
+ lambda context: ((_defs_sculpt.mask_by_color,)
- if context is None or (context.preferences.view.show_developer_ui and context.preferences.experimental.use_sculpt_vertex_colors)
+ if context is None
- else ()
- ),
+ else ()),
None,
_defs_sculpt.face_set_edit,
None,
diff --cc release/scripts/startup/bl_ui/space_userpref.py
index 45e9a99e960,ee27dc4fd63..1303f6d7fb5
--- a/release/scripts/startup/bl_ui/space_userpref.py
+++ b/release/scripts/startup/bl_ui/space_userpref.py
@@@ -29,7 -29,7 +29,6 @@@ from bpy.app.translations import contex
# -----------------------------------------------------------------------------
# Main Header
--
class USERPREF_HT_header(Header):
bl_space_type = 'PREFERENCES'
@@@ -43,11 -43,11 +42,9 @@@
pass
else:
# Show '*' to let users know the preferences have been modified.
-- layout.operator(
-- "wm.save_userpref",
++ layout.operator("wm.save_userpref",
text=iface_("Save Preferences") + (" *" if prefs.is_dirty else ""),
-- translate=False,
-- )
++ translate=False,)
def draw(self, context):
layout = self.layout
@@@ -64,7 -64,7 +61,6 @@@
# -----------------------------------------------------------------------------
# Main Navigation Bar
--
class USERPREF_PT_navigation_bar(Panel):
bl_label = "Preferences Navigation"
bl_space_type = 'PREFERENCES'
@@@ -187,7 -187,7 +183,6 @@@ class CenterAlignMixIn
# -----------------------------------------------------------------------------
# Interface Panels
--
class InterfacePanel:
bl_space_type = 'PREFERENCES'
bl_region_type = 'WINDOW'
@@@ -353,7 -353,7 +348,6 @@@ class USERPREF_PT_interface_menus_pie(I
# -----------------------------------------------------------------------------
# Editing Panels
--
class EditingPanel:
bl_space_type = 'PREFERENCES'
bl_region_type = 'WINDOW'
@@@ -400,7 -400,7 +394,8 @@@ class USERPREF_PT_edit_objects_duplicat
col.prop(edit, "use_duplicate_armature", text="Armature")
col.prop(edit, "use_duplicate_camera", text="Camera")
col.prop(edit, "use_duplicate_curve", text="Curve")
-- # col.prop(edit, "use_duplicate_fcurve", text="F-Curve") # Not implemented.
++ # col.prop(edit, "use_duplicate_fcurve", text="F-Curve") # Not
++ # implemented.
col.prop(edit, "use_duplicate_grease_pencil", text="Grease Pencil")
if hasattr(edit, "use_duplicate_hair"):
col.prop(edit, "use_duplicate_hair", text="Hair")
@@@ -420,7 -420,7 +415,8 @@@
col.prop(edit, "use_duplicate_speaker", text="Speaker")
col.prop(edit, "use_duplicate_surface", text="Surface")
col.prop(edit, "use_duplicate_text", text="Text")
-- # col.prop(edit, "use_duplicate_texture", text="Texture") # Not implemented.
++ # col.prop(edit, "use_duplicate_texture", text="Texture") # Not
++ # implemented.
col.prop(edit, "use_duplicate_volume", text="Volume")
@@@ -493,7 -493,7 +489,6 @@@ class USERPREF_PT_edit_misc(EditingPane
# -----------------------------------------------------------------------------
# Animation Panels
--
class AnimationPanel:
bl_space_type = 'PREFERENCES'
bl_region_type = 'WINDOW'
@@@ -556,7 -556,7 +551,6 @@@ class USERPREF_PT_animation_fcurves(Ani
# -----------------------------------------------------------------------------
# System Panels
--
class SystemPanel:
bl_space_type = 'PREFERENCES'
bl_region_type = 'WINDOW'
@@@ -607,8 -607,8 +601,6 @@@ class USERPREF_PT_system_cycles_devices
# if hasattr(system, "opensubdiv_compute_type"):
# col.label(text="OpenSubdiv compute:")
# col.row().prop(system, "opensubdiv_compute_type", text="")
--
--
class USERPREF_PT_system_os_settings(SystemPanel, CenterAlignMixIn, Panel):
bl_label = "Operating System Settings"
@@@ -683,7 -683,7 +675,6 @@@ class USERPREF_PT_system_video_sequence
# -----------------------------------------------------------------------------
# Viewport Panels
--
class ViewportPanel:
bl_space_type = 'PREFERENCES'
bl_region_type = 'WINDOW'
@@@ -762,7 -762,7 +753,6 @@@ class USERPREF_PT_viewport_selection(Vi
# -----------------------------------------------------------------------------
# Theme Panels
--
class ThemePanel:
bl_space_type = 'PREFERENCES'
bl_region_type = 'WINDOW'
@@@ -774,10 -774,10 +764,8 @@@ class USERPREF_MT_interface_theme_prese
preset_subdir = "interface_theme"
preset_operator = "script.execute_preset"
preset_type = 'XML'
-- preset_xml_map = (
-- ("preferences.themes[0]", "Theme"),
-- ("preferences.ui_styles[0]", "ThemeStyle"),
-- )
++ preset_xml_map = (("preferences.themes[0]", "Theme"),
++ ("preferences.ui_styles[0]", "ThemeStyle"),)
draw = Menu.draw_preset
@staticmethod
@@@ -937,8 -937,8 +925,7 @@@ class USERPREF_PT_theme_interface_trans
theme = context.preferences.themes[0]
ui = theme.user_interface
-- flow = layout.grid_flow(
-- row_major=False, columns=0, even_columns=True, even_rows=False, align=False)
++ flow = layout.grid_flow(row_major=False, columns=0, even_columns=True, even_rows=False, align=False)
flow.prop(ui, "transparent_checker_primary")
flow.prop(ui, "transparent_checker_secondary")
@@@ -1178,8 -1178,8 +1165,7 @@@ class ThemeGenericClassGenerator
@staticmethod
def generate_panel_classes_for_wcols():
-- wcols = [
-- ("Regular", "wcol_regular"),
++ wcols = [("Regular", "wcol_regular"),
("Tool", "wcol_tool"),
("Toolbar Item", "wcol_toolbar_item"),
("Radio Buttons", "wcol_radio"),
@@@ -1198,8 -1198,8 +1184,7 @@@
("Scroll Bar", "wcol_scroll"),
("Progress Bar", "wcol_progress"),
("List Item", "wcol_list_item"),
-- ("Tab", "wcol_tab"),
-- ]
++ ("Tab", "wcol_tab"),]
for (name, wcol) in wcols:
panel_id = "USERPREF_PT_theme_interface_" + wcol
@@@ -1244,12 -1244,12 +1229,10 @@@
"datapath": new_datapath,
})
-- yield from generate_child_panel_classes_recurse(
-- panel_id,
++ yield from generate_child_panel_classes_recurse(panel_id,
prop.fixed_type,
theme_area,
-- new_datapath,
-- )
++ new_datapath,)
yield from generate_child_panel_classes_recurse(parent_id, rna_type, theme_area, datapath)
@@@ -1273,8 -1273,8 +1256,7 @@@
"datapath": theme_area.identifier.lower(),
})
-- yield from ThemeGenericClassGenerator.generate_theme_area_child_panel_classes(
-- panel_id, Theme.bl_rna.properties[theme_area.identifier.lower()].fixed_type,
++ yield from ThemeGenericClassGenerator.generate_theme_area_child_panel_classes(panel_id, Theme.bl_rna.properties[theme_area.identifier.lower()].fixed_type,
theme_area, theme_area.identifier.lower())
@@@ -1427,7 -1427,7 +1409,6 @@@ class USERPREF
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list