diff options
author | Brecht Van Lommel <brecht@blender.org> | 2021-10-11 18:56:18 +0300 |
---|---|---|
committer | Brecht Van Lommel <brecht@blender.org> | 2021-10-11 19:22:54 +0300 |
commit | db851ccd2a896f3f058dba56a5380fb2bf1ae0f9 (patch) | |
tree | 61edd7ed4f0dffa0c0e5a514d13564873c4d6bd1 /intern | |
parent | a94343a8afcac5d6db09c8461e67ad1ba5a85d35 (diff) |
Fix T92056: empty sampling pattern in Cycles when opening some existing files
Diffstat (limited to 'intern')
-rw-r--r-- | intern/cycles/blender/addon/properties.py | 4 | ||||
-rw-r--r-- | intern/cycles/blender/addon/version_update.py | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/intern/cycles/blender/addon/properties.py b/intern/cycles/blender/addon/properties.py index 8c1f26d7b9f..faa0aaec8ae 100644 --- a/intern/cycles/blender/addon/properties.py +++ b/intern/cycles/blender/addon/properties.py @@ -86,8 +86,8 @@ enum_use_layer_samples = ( ) enum_sampling_pattern = ( - ('SOBOL', "Sobol", "Use Sobol random sampling pattern"), - ('PROGRESSIVE_MUTI_JITTER', "Progressive Multi-Jitter", "Use Progressive Multi-Jitter random sampling pattern"), + ('SOBOL', "Sobol", "Use Sobol random sampling pattern", 0), + ('PROGRESSIVE_MUTI_JITTER', "Progressive Multi-Jitter", "Use Progressive Multi-Jitter random sampling pattern", 1), ) enum_volume_sampling = ( diff --git a/intern/cycles/blender/addon/version_update.py b/intern/cycles/blender/addon/version_update.py index 57da7d7995c..b3e8e755903 100644 --- a/intern/cycles/blender/addon/version_update.py +++ b/intern/cycles/blender/addon/version_update.py @@ -235,7 +235,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"): + if not cscene.is_property_set("sampling_pattern") or \ + cscene.get('sampling_pattern') >= 2: cscene.sampling_pattern = 'PROGRESSIVE_MUTI_JITTER' # Removal of square samples. |