Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix T92056: empty sampling pattern in Cycles when opening some existing files

Browse Source
This commit is contained in:
Brecht Van Lommel
2021-10-11 17:56:18 +02:00
parent a94343a8af
commit db851ccd2a
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
intern/cycles/blender/addon/properties.py
View File

@@ -86,8 +86,8 @@ enum_use_layer_samples = (
) )
enum_sampling_pattern = ( enum_sampling_pattern = (
('SOBOL', "Sobol", "Use Sobol random sampling pattern"), ('SOBOL', "Sobol", "Use Sobol random sampling pattern", 0),
('PROGRESSIVE_MUTI_JITTER', "Progressive Multi-Jitter", "Use Progressive Multi-Jitter random sampling pattern"), ('PROGRESSIVE_MUTI_JITTER', "Progressive Multi-Jitter", "Use Progressive Multi-Jitter random sampling pattern", 1),
) )
enum_volume_sampling = ( enum_volume_sampling = (

3
intern/cycles/blender/addon/version_update.py
View File

@@ -235,7 +235,8 @@ def do_versions(self):
cscene.use_denoising = False cscene.use_denoising = False
if not cscene.is_property_set("use_preview_denoising"): if not cscene.is_property_set("use_preview_denoising"):
cscene.use_preview_denoising = False 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' cscene.sampling_pattern = 'PROGRESSIVE_MUTI_JITTER'
# Removal of square samples. # Removal of square samples.