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/files/render/camera/cycles_renders/osl_camera_advanced.png
+++ b/tests/files/render/camera/cycles_renders/osl_camera_advanced.png
--- a/tests/files/render/camera/cycles_renders/osl_camera_advanced_manual_dof.png
+++ b/tests/files/render/camera/cycles_renders/osl_camera_advanced_manual_dof.png
--- a/tests/files/render/camera/cycles_renders/osl_camera_advanced_manual_dof_138188.png
+++ b/tests/files/render/camera/cycles_renders/osl_camera_advanced_manual_dof_138188.png
--- a/tests/files/render/camera/cycles_renders/osl_camera_cubemap.png
+++ b/tests/files/render/camera/cycles_renders/osl_camera_cubemap.png
--- a/tests/files/render/camera/cycles_renders/osl_camera_cubemap_auto_derivatives.png
+++ b/tests/files/render/camera/cycles_renders/osl_camera_cubemap_auto_derivatives.png
--- a/tests/files/render/camera/cycles_renders/osl_camera_offset_in_volume.png
+++ b/tests/files/render/camera/cycles_renders/osl_camera_offset_in_volume.png
--- a/tests/files/render/camera/eevee_next_renders/camera_central_cylindrical.png
+++ b/tests/files/render/camera/eevee_next_renders/camera_central_cylindrical.png
--- a/tests/files/render/camera/eevee_next_renders/camera_depth_of_field.png
+++ b/tests/files/render/camera/eevee_next_renders/camera_depth_of_field.png
--- a/tests/files/render/camera/eevee_next_renders/camera_equiangular_cubemap_face.png
+++ b/tests/files/render/camera/eevee_next_renders/camera_equiangular_cubemap_face.png
--- a/tests/files/render/camera/eevee_next_renders/camera_equirectangular.png
+++ b/tests/files/render/camera/eevee_next_renders/camera_equirectangular.png
--- a/tests/files/render/camera/eevee_next_renders/camera_fisheye_equidistant.png
+++ b/tests/files/render/camera/eevee_next_renders/camera_fisheye_equidistant.png
--- a/tests/files/render/camera/eevee_next_renders/camera_fisheye_equisolid.png
+++ b/tests/files/render/camera/eevee_next_renders/camera_fisheye_equisolid.png
--- a/tests/files/render/camera/eevee_next_renders/camera_fisheye_polynomial.png
+++ b/tests/files/render/camera/eevee_next_renders/camera_fisheye_polynomial.png
--- a/tests/files/render/camera/eevee_next_renders/camera_mirror_ball.png
+++ b/tests/files/render/camera/eevee_next_renders/camera_mirror_ball.png
--- a/tests/files/render/camera/eevee_next_renders/camera_ortho.png
+++ b/tests/files/render/camera/eevee_next_renders/camera_ortho.png
--- a/tests/files/render/camera/eevee_next_renders/camera_ortho_depth_of_field_near_clip.png
+++ b/tests/files/render/camera/eevee_next_renders/camera_ortho_depth_of_field_near_clip.png
--- a/tests/files/render/camera/eevee_next_renders/camera_polygonal_bokeh.png
+++ b/tests/files/render/camera/eevee_next_renders/camera_polygonal_bokeh.png
--- a/tests/files/render/camera/eevee_next_renders/camera_stereo_panoramic.png
+++ b/tests/files/render/camera/eevee_next_renders/camera_stereo_panoramic.png
--- a/tests/files/render/camera/eevee_next_renders/camera_stereo_perspective.png
+++ b/tests/files/render/camera/eevee_next_renders/camera_stereo_perspective.png
--- a/tests/files/render/camera/eevee_next_renders/osl_camera_advanced.png
+++ b/tests/files/render/camera/eevee_next_renders/osl_camera_advanced.png
--- a/tests/files/render/camera/eevee_next_renders/osl_camera_advanced_manual_dof.png
+++ b/tests/files/render/camera/eevee_next_renders/osl_camera_advanced_manual_dof.png
--- a/tests/files/render/camera/eevee_next_renders/osl_camera_advanced_manual_dof_138188.png
+++ b/tests/files/render/camera/eevee_next_renders/osl_camera_advanced_manual_dof_138188.png
--- a/tests/files/render/camera/eevee_next_renders/osl_camera_cubemap.png
+++ b/tests/files/render/camera/eevee_next_renders/osl_camera_cubemap.png
--- a/tests/files/render/camera/eevee_next_renders/osl_camera_cubemap_auto_derivatives.png
+++ b/tests/files/render/camera/eevee_next_renders/osl_camera_cubemap_auto_derivatives.png
--- a/tests/files/render/camera/eevee_next_renders/osl_camera_offset_in_volume.png
+++ b/tests/files/render/camera/eevee_next_renders/osl_camera_offset_in_volume.png
--- a/tests/files/render/camera/eevee_renders/osl_camera_advanced.png
+++ b/tests/files/render/camera/eevee_renders/osl_camera_advanced.png
--- a/tests/files/render/camera/eevee_renders/osl_camera_advanced_manual_dof.png
+++ b/tests/files/render/camera/eevee_renders/osl_camera_advanced_manual_dof.png
--- a/tests/files/render/camera/eevee_renders/osl_camera_advanced_manual_dof_138188.png
+++ b/tests/files/render/camera/eevee_renders/osl_camera_advanced_manual_dof_138188.png
--- a/tests/files/render/camera/eevee_renders/osl_camera_cubemap.png
+++ b/tests/files/render/camera/eevee_renders/osl_camera_cubemap.png
--- a/tests/files/render/camera/eevee_renders/osl_camera_cubemap_auto_derivatives.png
+++ b/tests/files/render/camera/eevee_renders/osl_camera_cubemap_auto_derivatives.png
--- a/tests/files/render/camera/eevee_renders/osl_camera_offset_in_volume.png
+++ b/tests/files/render/camera/eevee_renders/osl_camera_offset_in_volume.png
--- a/tests/files/render/camera/osl_camera_advanced.blend
+++ b/tests/files/render/camera/osl_camera_advanced.blend
--- a/tests/files/render/camera/osl_camera_advanced_manual_dof.blend
+++ b/tests/files/render/camera/osl_camera_advanced_manual_dof.blend
--- a/tests/files/render/camera/osl_camera_advanced_manual_dof_138188.blend
+++ b/tests/files/render/camera/osl_camera_advanced_manual_dof_138188.blend
--- a/tests/files/render/camera/osl_camera_cubemap.blend
+++ b/tests/files/render/camera/osl_camera_cubemap.blend
--- a/tests/files/render/camera/osl_camera_cubemap_auto_derivatives.blend
+++ b/tests/files/render/camera/osl_camera_cubemap_auto_derivatives.blend
--- a/tests/files/render/camera/osl_camera_offset_in_volume.blend
+++ b/tests/files/render/camera/osl_camera_offset_in_volume.blend
--- a/tests/files/render/camera/storm_hydra_renders/osl_camera_advanced.png
+++ b/tests/files/render/camera/storm_hydra_renders/osl_camera_advanced.png
--- a/tests/files/render/camera/storm_hydra_renders/osl_camera_advanced_manual_dof.png
+++ b/tests/files/render/camera/storm_hydra_renders/osl_camera_advanced_manual_dof.png
--- a/tests/files/render/camera/storm_hydra_renders/osl_camera_advanced_manual_dof_138188.png
+++ b/tests/files/render/camera/storm_hydra_renders/osl_camera_advanced_manual_dof_138188.png
--- a/tests/files/render/camera/storm_hydra_renders/osl_camera_cubemap.png
+++ b/tests/files/render/camera/storm_hydra_renders/osl_camera_cubemap.png
--- a/tests/files/render/camera/storm_hydra_renders/osl_camera_cubemap_auto_derivatives.png
+++ b/tests/files/render/camera/storm_hydra_renders/osl_camera_cubemap_auto_derivatives.png
--- a/tests/files/render/camera/storm_hydra_renders/osl_camera_offset_in_volume.png
+++ b/tests/files/render/camera/storm_hydra_renders/osl_camera_offset_in_volume.png
--- a/tests/files/render/camera/storm_usd_renders/osl_camera_advanced.png
+++ b/tests/files/render/camera/storm_usd_renders/osl_camera_advanced.png
--- a/tests/files/render/camera/storm_usd_renders/osl_camera_advanced_manual_dof.png
+++ b/tests/files/render/camera/storm_usd_renders/osl_camera_advanced_manual_dof.png
--- a/tests/files/render/camera/storm_usd_renders/osl_camera_advanced_manual_dof_138188.png
+++ b/tests/files/render/camera/storm_usd_renders/osl_camera_advanced_manual_dof_138188.png
--- a/tests/files/render/camera/storm_usd_renders/osl_camera_cubemap.png
+++ b/tests/files/render/camera/storm_usd_renders/osl_camera_cubemap.png
--- a/tests/files/render/camera/storm_usd_renders/osl_camera_cubemap_auto_derivatives.png
+++ b/tests/files/render/camera/storm_usd_renders/osl_camera_cubemap_auto_derivatives.png
--- a/tests/files/render/camera/storm_usd_renders/osl_camera_offset_in_volume.png
+++ b/tests/files/render/camera/storm_usd_renders/osl_camera_offset_in_volume.png
--- a/tests/files/render/camera/workbench_renders/osl_camera_advanced.png
+++ b/tests/files/render/camera/workbench_renders/osl_camera_advanced.png
--- a/tests/files/render/camera/workbench_renders/osl_camera_advanced_manual_dof.png
+++ b/tests/files/render/camera/workbench_renders/osl_camera_advanced_manual_dof.png
--- a/tests/files/render/camera/workbench_renders/osl_camera_advanced_manual_dof_138188.png
+++ b/tests/files/render/camera/workbench_renders/osl_camera_advanced_manual_dof_138188.png
--- a/tests/files/render/camera/workbench_renders/osl_camera_cubemap.png
+++ b/tests/files/render/camera/workbench_renders/osl_camera_cubemap.png
--- a/tests/files/render/camera/workbench_renders/osl_camera_cubemap_auto_derivatives.png
+++ b/tests/files/render/camera/workbench_renders/osl_camera_cubemap_auto_derivatives.png
--- a/tests/files/render/camera/workbench_renders/osl_camera_offset_in_volume.png
+++ b/tests/files/render/camera/workbench_renders/osl_camera_offset_in_volume.png
--- 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 = [