Merge branch 'blender-v4.5-release'

tests/python/CMakeLists.txt

@@ -1265,6 +1265,13 @@ if(TEST_SRC_DIR_EXISTS)
     --
     --testdir "${TEST_SRC_DIR}/sculpting"
   )
+
+  add_blender_test(
+    bl_sculpt_brush_curve_presets
+    --python ${CMAKE_CURRENT_LIST_DIR}/sculpt_paint/brush_strength_curves_test.py
+    --
+    --testdir "${TEST_SRC_DIR}/sculpting"
+  )
 endif()
 
 if(WITH_GPU_MESH_PAINT_TESTS AND TEST_SRC_DIR_EXISTS)

tests/python/sculpt_paint/brush_strength_curves_test.py

@@ -0,0 +1,169 @@
+# SPDX-FileCopyrightText: 2025 Blender Authors
+#
+# SPDX-License-Identifier: GPL-2.0-or-later */
+
+__all__ = (
+    "main",
+)
+
+import math
+import unittest
+import sys
+import pathlib
+import numpy as np
+
+import bpy
+
+"""
+blender -b --factory-startup --python tests/python/sculpt_paint/brush_strength_curves_test.py -- --testdir tests/files/sculpting/
+"""
+
+args = None
+
+
+def set_view3d_context_override(context_override):
+    """
+    Set context override to become the first viewport in the active workspace
+
+    The ``context_override`` is expected to be a copy of an actual current context
+    obtained by `context.copy()`
+    """
+
+    for area in context_override["screen"].areas:
+        if area.type != 'VIEW_3D':
+            continue
+        for space in area.spaces:
+            if space.type != 'VIEW_3D':
+                continue
+            for region in area.regions:
+                if region.type != 'WINDOW':
+                    continue
+                context_override["area"] = area
+                context_override["region"] = region
+
+
+def generate_stroke(context):
+    """
+    Generate stroke for the bpy.ops.sculpt.brush_stroke operator
+
+    The generated stroke coves the full plane diagonal.
+    """
+    import bpy
+    from mathutils import Vector
+
+    template = {
+        "name": "stroke",
+        "mouse": (0.0, 0.0),
+        "mouse_event": (0, 0),
+        "is_start": True,
+        "location": (0, 0, 0),
+        "pressure": 1.0,
+        "time": 1.0,
+        "size": 1.0,
+        "x_tilt": 0,
+        "y_tilt": 0
+    }
+
+    num_steps = 100
+    start = Vector((context['area'].width, context['area'].height))
+    end = Vector((0, 0))
+    delta = (end - start) / (num_steps - 1)
+
+    stroke = []
+    for i in range(num_steps):
+        step = template.copy()
+        step["mouse_event"] = start + delta * i
+        stroke.append(step)
+
+    return stroke
+
+
+class BrushCurvesTest(unittest.TestCase):
+    """
+    Test that using a basic "Draw" brush stroke with each of the given brush curve presets doesn't produce invalid
+    deformations in the mesh, usually resulting in what looks like geometry disappearing to the user.
+    """
+
+    def setUp(self):
+        bpy.ops.wm.read_factory_settings(use_empty=True)
+        bpy.ops.ed.undo_push()
+
+        bpy.ops.mesh.primitive_monkey_add()
+        bpy.ops.sculpt.sculptmode_toggle()
+
+    def _check_stroke(self):
+        # Ideally, we would use something like pytest and parameterized tests here, but this helper function is an
+        # alright solution for now...
+        context_override = bpy.context.copy()
+        set_view3d_context_override(context_override)
+        with bpy.context.temp_override(**context_override):
+            bpy.ops.sculpt.brush_stroke(stroke=generate_stroke(context_override), override_location=True)
+
+        mesh = bpy.context.object.data
+        position_attr = mesh.attributes['position']
+
+        num_vertices = mesh.attributes.domain_size('POINT')
+
+        position_data = np.zeros((num_vertices * 3), dtype=np.float32)
+        position_attr.data.foreach_get('vector', np.ravel(position_data))
+
+        # Note, depending on if the tests are run with asserts enabled or not, the test may fail before this point
+        # inside blender itself.
+        all_valid = all([not math.isinf(pos) and not math.isnan(pos) for pos in position_data])
+        self.assertTrue(all_valid, "All position componentes should be rational values")
+
+    def test_smooth_preset_curve_creates_valid_stroke(self):
+        bpy.context.tool_settings.sculpt.brush.curve_preset = 'SMOOTH'
+        self._check_stroke()
+
+    def test_smoother_preset_curve_creates_valid_stroke(self):
+        bpy.context.tool_settings.sculpt.brush.curve_preset = 'SMOOTHER'
+        self._check_stroke()
+
+    def test_sphere_preset_curve_creates_valid_stroke(self):
+        bpy.context.tool_settings.sculpt.brush.curve_preset = 'SPHERE'
+        self._check_stroke()
+
+    def test_root_preset_curve_creates_valid_stroke(self):
+        bpy.context.tool_settings.sculpt.brush.curve_preset = 'ROOT'
+        self._check_stroke()
+
+    def test_sharp_preset_curve_creates_valid_stroke(self):
+        bpy.context.tool_settings.sculpt.brush.curve_preset = 'SHARP'
+        self._check_stroke()
+
+    def test_linear_preset_curve_creates_valid_stroke(self):
+        bpy.context.tool_settings.sculpt.brush.curve_preset = 'LIN'
+        self._check_stroke()
+
+    def test_sharper_preset_curve_creates_valid_stroke(self):
+        bpy.context.tool_settings.sculpt.brush.curve_preset = 'POW4'
+        self._check_stroke()
+
+    def test_inverse_square_preset_curve_creates_valid_stroke(self):
+        bpy.context.tool_settings.sculpt.brush.curve_preset = 'INVSQUARE'
+        self._check_stroke()
+
+    def test_constant_preset_curve_creates_valid_stroke(self):
+        bpy.context.tool_settings.sculpt.brush.curve_preset = 'CONSTANT'
+        self._check_stroke()
+
+
+def main():
+    global args
+    import argparse
+
+    argv = [sys.argv[0]]
+    if '--' in sys.argv:
+        argv += sys.argv[sys.argv.index('--') + 1:]
+
+    parser = argparse.ArgumentParser()
+    parser.add_argument('--testdir', required=True, type=pathlib.Path)
+
+    args, remaining = parser.parse_known_args(argv)
+
+    unittest.main(argv=remaining)
+
+
+if __name__ == "__main__":
+    main()