[Bf-blender-cvs] [2493c470d61] cycles-x: Cycles X: make progressive multi-jitter the default sampling pattern

[Brecht Van Lommel]

Commit: 2493c470d61a5b4cbfef87734f131a8d2e06d9c0
Author: Brecht Van Lommel
Date:   Mon Sep 20 16:34:34 2021 +0200
Branches: cycles-x
https://developer.blender.org/rB2493c470d61a5b4cbfef87734f131a8d2e06d9c0

Cycles X: make progressive multi-jitter the default sampling pattern

Now that adaptive sampling is enabled by default this was already the case in
practice, but use it now also for the non-adaptive case so the sampling patterns
stays consistent when switching that on and off.

A reason to do this now is that we will need to update all the test reference
images for the cycles-x merge, and those are all affected by the sampling pattern.

===================================================================

M	intern/cycles/blender/addon/properties.py
M	intern/cycles/blender/addon/version_update.py

===================================================================

diff --git a/intern/cycles/blender/addon/properties.py b/intern/cycles/blender/addon/properties.py
index 2c29c012f83..c2570e71efd 100644
--- a/intern/cycles/blender/addon/properties.py
+++ b/intern/cycles/blender/addon/properties.py
@@ -333,7 +333,7 @@ class CyclesRenderSettings(bpy.types.PropertyGroup):
         name="Sampling Pattern",
         description="Random sampling pattern used by the integrator",
         items=enum_sampling_pattern,
-        default='SOBOL',
+        default='PROGRESSIVE_MUTI_JITTER',
     )
 
     use_layer_samples: EnumProperty(
diff --git a/intern/cycles/blender/addon/version_update.py b/intern/cycles/blender/addon/version_update.py
index b7c6e4cf3e9..803c78e1bf8 100644
--- a/intern/cycles/blender/addon/version_update.py
+++ b/intern/cycles/blender/addon/version_update.py
@@ -236,6 +236,8 @@ def do_versions(self):
                     cscene.use_denoising = False
                 if not cscene.is_property_set("use_preview_denoising"):
                     cscene.use_preview_denoising = False
+                if not cscene.is_property_set("sampling_pattern"):
+                    cscene.sampling_pattern = 'PROGRESSIVE_MUTI_JITTER'
 
                 # Removal of square samples.
                 cscene = scene.cycles