[Bf-blender-cvs] [9c619fd3818] sculpt-dev: Merge remote-tracking branch 'origin' into sculpt-dev
Joseph Eagar
noreply at git.blender.org
Sat Oct 1 02:53:48 CEST 2022
Commit: 9c619fd38186c41bf3a72cc75d6e137fdbf58052
Author: Joseph Eagar
Date: Fri Sep 30 17:35:24 2022 -0700
Branches: sculpt-dev
https://developer.blender.org/rB9c619fd38186c41bf3a72cc75d6e137fdbf58052
Merge remote-tracking branch 'origin' into sculpt-dev
===================================================================
===================================================================
diff --cc intern/ghost/GHOST_Types.h
index 1f43374a456,182eb6eb7d2..de2880e1521
--- a/intern/ghost/GHOST_Types.h
+++ b/intern/ghost/GHOST_Types.h
@@@ -9,20 -9,14 +9,26 @@@
#include <stdint.h>
+#ifndef ATTR_NO_OPT
+# ifdef __clang__
+# define ATTR_NO_OPT __attribute__((optnone))
+# elif defined(_MSC_VER)
+# define ATTR_NO_OPT __pragma(optimize("", off))
+# elif defined(__GNUC__)
+# define ATTR_NO_OPT __attribute__((optimize("O0")))
+# else
+# define ATTR_NO_OPT
+# endif
+#endif
+
#ifdef WITH_CXX_GUARDEDALLOC
# include "MEM_guardedalloc.h"
+ #else
+ /* Convenience unsigned abbreviations (#WITH_CXX_GUARDEDALLOC defines these). */
+ typedef unsigned int uint;
+ typedef unsigned short ushort;
+ typedef unsigned long ulong;
+ typedef unsigned char uchar;
#endif
#if defined(WITH_CXX_GUARDEDALLOC) && defined(__cplusplus)
diff --cc intern/guardedalloc/CMakeLists.txt
index 21bcb5675db,0d16879adb5..55b720a83a7
--- a/intern/guardedalloc/CMakeLists.txt
+++ b/intern/guardedalloc/CMakeLists.txt
@@@ -7,8 -7,8 +7,9 @@@ endif(
set(INC
.
+ ..
../atomic
+ ../../source/blender/blenlib
)
set(INC_SYS
diff --cc release/scripts/addons
index 849e7196eb4,726d08c9036..f1520a9a78d
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit 849e7196eb4ee7bc5ca8a5644da49ffbd3ff3c97
-Subproject commit 726d08c9036b939f46b59bceb72a61e3102600cc
++Subproject commit f1520a9a78d9e83cb9c05022f330880e5315cb4a
diff --cc release/scripts/startup/bl_ui/properties_paint_common.py
index 5088e85111e,72a87703bd5..141be2fa514
--- a/release/scripts/startup/bl_ui/properties_paint_common.py
+++ b/release/scripts/startup/bl_ui/properties_paint_common.py
@@@ -2191,9 -943,39 +2191,40 @@@ def brush_settings_advanced(layout, con
# boundary edges/face sets automasking
col.prop(brush, "use_automasking_boundary_edges", text="Mesh Boundary")
col.prop(brush, "use_automasking_boundary_face_sets", text="Face Sets Boundary")
+ col.prop(brush, "use_automasking_cavity", text="Cavity")
+ col.prop(brush, "use_automasking_cavity_inverted", text="Cavity (Inverted)")
+ col.prop(brush, "use_automasking_start_normal", text="Area Normal")
+ col.prop(brush, "use_automasking_view_normal", text="View Normal")
+
+ col.separator()
col.prop(brush, "automasking_boundary_edges_propagation_steps")
+ """
+ sculpt = context.tool_settings.sculpt
+
+ if brush.use_automasking_start_normal:
+ col.separator()
+
+ col.prop(sculpt, "automasking_start_normal_limit")
+ col.prop(sculpt, "automasking_start_normal_falloff")
+
+ if brush.use_automasking_view_normal:
+ col.separator()
+
+ col.prop(brush, "use_automasking_view_occlusion", text="Occlusion")
+ col.prop(sculpt, "automasking_view_normal_limit")
+ col.prop(sculpt, "automasking_view_normal_falloff")
+
+ if brush.use_automasking_cavity or brush.use_automasking_cavity_inverted:
+ col.separator()
+
+ col.prop(brush, "automasking_cavity_factor", text="Cavity Factor")
+ col.prop(brush, "automasking_cavity_blur_steps", text="Cavity Blur")
+ col.prop(brush, "use_automasking_custom_cavity_curve", text="Use Curve")
+
+ if brush.use_automasking_custom_cavity_curve:
+ col.template_curve_mapping(brush, "automasking_cavity_curve")
+
layout.separator()
# sculpt plane settings
diff --cc release/scripts/startup/bl_ui/space_view3d.py
index 98de0aa2db5,ada2993a16f..977cf8cfb24
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@@ -5471,17 -5491,15 +5473,17 @@@ class VIEW3D_MT_sculpt_automasking_pie(
tool_settings = context.tool_settings
sculpt = tool_settings.sculpt
- pie.prop(sculpt, "use_automasking_topology", text="Topology")
- pie.prop(sculpt, "use_automasking_face_sets", text="Face Sets")
- pie.prop(sculpt, "use_automasking_boundary_edges", text="Mesh Boundary")
- pie.prop(sculpt, "use_automasking_boundary_face_sets", text="Face Sets Boundary")
- pie.prop(sculpt, "use_automasking_cavity", text="Cavity")
- pie.prop(sculpt, "use_automasking_cavity_inverted", text="Cavity (Inverted)")
- pie.prop(sculpt, "use_automasking_start_normal", text="Area Normal")
- pie.prop(sculpt, "use_automasking_view_normal", text="View Normal")
+ ch = UnifiedPaintPanel.get_channel(context, sculpt.brush, "automasking")
- keys = ["TOPOLOGY", "FACE_SETS", "BOUNDARY_EDGE", "BOUNDARY_FACE_SETS"]
++ keys = ["TOPOLOGY", "FACE_SETS", "BOUNDARY_EDGE", "BOUNDARY_FACE_SETS", "CAVITY", "CAVITY_INVERTED", "BRUSH_NORMAL", "VIEW_NORMAL"]
+
+ for item in ch.enum_items:
+ if item.identifier not in keys:
+ keys.append(item.identifier)
+
+ for key in keys:
+ print(key)
+ pie.prop_enum(ch, "value", key)
class VIEW3D_MT_sculpt_face_sets_edit_pie(Menu):
diff --cc release/scripts/startup/bl_ui/space_view3d_toolbar.py
index 01b2c01d569,6946ab54ca7..3e2223b8745
--- a/release/scripts/startup/bl_ui/space_view3d_toolbar.py
+++ b/release/scripts/startup/bl_ui/space_view3d_toolbar.py
@@@ -1372,129 -962,53 +1372,129 @@@ class VIEW3D_PT_sculpt_options(Panel, V
col = layout.column(heading="Display", align=True)
col.prop(sculpt, "show_low_resolution")
col.prop(sculpt, "use_sculpt_delay_updates")
+ col.prop(sculpt, "use_fast_draw")
col.prop(sculpt, "use_deform_only")
-
- col.separator()
-
- col = layout.column(heading="Auto-Masking", align=True)
-
- col.prop(sculpt, "use_automasking_topology", text="Topology")
- col.prop(sculpt, "use_automasking_face_sets", text="Face Sets")
- col.prop(sculpt, "use_automasking_boundary_edges", text="Mesh Boundary")
- col.prop(sculpt, "use_automasking_boundary_face_sets", text="Face Sets Boundary")
- col.prop(sculpt, "use_automasking_cavity", text="Cavity")
- col.prop(sculpt, "use_automasking_cavity_inverted", text="Cavity (Inverted)")
- col.prop(sculpt, "use_automasking_start_normal", text="Area Normal")
- col.prop(sculpt, "use_automasking_view_normal", text="View Normal")
+ col.prop(sculpt, "show_sculpt_pivot")
+ col.prop(context.object.data, "sculpt_ignore_uvs")
+
+ UnifiedPaintPanel.channel_unified(layout.column(),
+ context,
+ brush,
+ "smooth_strength_factor", ui_editing=False, slider=True, show_mappings=True)
+
+ UnifiedPaintPanel.channel_unified(layout.column(),
+ context,
+ brush,
+ "smooth_strength_projection", ui_editing=False, slider=True, show_mappings=True)
+
+ """
+ smoothbrush = None
+
+ for ts in sculpt.tool_slots:
+ if ts.brush and ts.brush.sculpt_tool == "SMOOTH":
+ smoothbrush = ts.brush
+ break
+
+ if smoothbrush:
+ UnifiedPaintPanel.channel_unified(layout.column(),
+ context,
+ smoothbrush,
+ "dyntopo_disabled", ui_editing=False, text="Disable Dyntopo For Smooth")
+ """
- if sculpt.use_automasking_start_normal:
- col.separator()
-
- col.prop(sculpt, "automasking_start_normal_limit")
- col.prop(sculpt, "automasking_start_normal_falloff")
+ col.separator()
- if sculpt.use_automasking_view_normal:
- col.separator()
+ UnifiedPaintPanel.channel_unified(layout.column(),
+ context,
+ brush,
+ "show_origco",
+ toolsettings_only=True, ui_editing=False)
- col.prop(sculpt, "use_automasking_view_occlusion", text="Occlusion")
- col.prop(sculpt, "automasking_view_normal_limit")
- col.prop(sculpt, "automasking_view_normal_falloff")
+ UnifiedPaintPanel.channel_unified(layout.column(),
+ context,
+ brush,
+ "save_temp_layers",
+ toolsettings_only=True, ui_editing=False)
col.separator()
- col.prop(sculpt.brush, "automasking_boundary_edges_propagation_steps")
- if sculpt.use_automasking_cavity or sculpt.use_automasking_cavity_inverted:
- col.separator()
+ col.operator("sculpt.set_limit_surface")
- col2 = col.column()
- props = col2.operator("sculpt.mask_from_cavity", text="Mask From Cavity")
- props.use_automask_settings = True
- col2 = col.column()
+# TODO, move to space_view3d.py
+class VIEW3D_PT_sculpt_automasking(Panel, View3DPaintPanel):
+ bl_context = ".sculpt_mode" # dot on purpose (access from topbar)
+ bl_label = "Automasking"
+ bl_options = {'DEFAULT_CLOSED'}
+ bl_ui_units_x = 12
- col2.prop(sculpt, "automasking_cavity_factor", text="Cavity Factor")
- col2.prop(sculpt, "automasking_cavity_blur_steps", text="Cavity Blur")
+ @classmethod
+ def poll(cls, context):
+ return (context.sculpt_object and context.tool_settings.sculpt)
- col2.prop(sculpt, "use_automasking_custom_cavity_curve", text="Use Curve")
+ def draw(self, context):
+ layout = self.layout
+ layout.use_property_split = True
+ layout.use_property_decorate = False
- if sculpt.use_automasking_custom_cavity_curve:
- col2.template_curve_mapping(sculpt, "automasking_cavity_curve")
+ tool_settings = context.tool_settings
+ sculpt = tool_settings.sculpt
+ brush = sculpt.brush
+
+ UnifiedPaintPanel.channel_unified(layout.column(),
+ context,
+ brush,
+ "automasking", toolsettings_only=True, expand=True,
+ ui_editing=False, text="Automasking (global)")
+
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list