[Bf-blender-cvs] [2b3becf2be2] blender-v3.0-release: Fix typo in Cycles PMJ enum define.

Thomas Dinges noreply at git.blender.org
Tue Nov 2 11:08:25 CET 2021


Commit: 2b3becf2be27286d68a49328a13c327d2fa94aeb
Author: Thomas Dinges
Date:   Tue Nov 2 11:07:06 2021 +0100
Branches: blender-v3.0-release
https://developer.blender.org/rB2b3becf2be27286d68a49328a13c327d2fa94aeb

Fix typo in Cycles PMJ enum define.

Reported by Raimund58 in the chat, thanks!

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

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 c92e0ec65af..3c90ea07cc6 100644
--- a/intern/cycles/blender/addon/properties.py
+++ b/intern/cycles/blender/addon/properties.py
@@ -87,7 +87,7 @@ enum_use_layer_samples = (
 
 enum_sampling_pattern = (
     ('SOBOL', "Sobol", "Use Sobol random sampling pattern", 0),
-    ('PROGRESSIVE_MUTI_JITTER', "Progressive Multi-Jitter", "Use Progressive Multi-Jitter random sampling pattern", 1),
+    ('PROGRESSIVE_MULTI_JITTER', "Progressive Multi-Jitter", "Use Progressive Multi-Jitter random sampling pattern", 1),
 )
 
 enum_volume_sampling = (
@@ -339,7 +339,7 @@ class CyclesRenderSettings(bpy.types.PropertyGroup):
         name="Sampling Pattern",
         description="Random sampling pattern used by the integrator. When adaptive sampling is enabled, Progressive Multi-Jitter is always used instead of Sobol",
         items=enum_sampling_pattern,
-        default='PROGRESSIVE_MUTI_JITTER',
+        default='PROGRESSIVE_MULTI_JITTER',
     )
 
     scrambling_distance: FloatProperty(
diff --git a/intern/cycles/blender/addon/version_update.py b/intern/cycles/blender/addon/version_update.py
index 76bc765ec1d..dab62713525 100644
--- a/intern/cycles/blender/addon/version_update.py
+++ b/intern/cycles/blender/addon/version_update.py
@@ -243,7 +243,7 @@ def do_versions(self):
                     cscene.use_preview_denoising = False
                 if not cscene.is_property_set("sampling_pattern") or \
                    cscene.get('sampling_pattern') >= 2:
-                    cscene.sampling_pattern = 'PROGRESSIVE_MUTI_JITTER'
+                    cscene.sampling_pattern = 'PROGRESSIVE_MULTI_JITTER'
 
                 # Removal of square samples.
                 cscene = scene.cycles



More information about the Bf-blender-cvs mailing list