Merge branch 'blender-v4.5-release'

2025-07-07 19:30:07 +02:00
parent 333e2068b6 b3cc9ed21b
commit ba5bdbcf28
57 changed files with 169 additions and 0 deletions
--- a/tests/python/cycles_render_tests.py
+++ b/tests/python/cycles_render_tests.py
@@ -70,6 +70,8 @@ BLOCKLIST_OPTIX_OSL_LIMITED = [
    'image_.*_osl.blend',
    # OptiX OSL doesn't support the trace function
    'osl_trace_shader.blend',
+    # Noise functions do not return color with OptiX OSL
+    'osl_camera_advanced.blend',
 ]

 # Blocklist for SVM tests that fail when forced to run with OptiX OSL
--- a/tests/python/eevee_render_tests.py
+++ b/tests/python/eevee_render_tests.py
@@ -61,6 +61,8 @@ BLOCKLIST_METAL = [
    "image.blend",
    # Blocked due to differences in transparency.
    "aov_transparency.blend",
+    # Blocked due to subtle differences in DOF
+    "osl_camera_advanced.blend",
 ]

 BLOCKLIST_VULKAN = [