diff options
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/cycles/blender/addon/ui.py | 2 | ||||
| -rw-r--r-- | intern/cycles/blender/blender_sync.cpp | 5 |
2 files changed, 2 insertions, 5 deletions
diff --git a/intern/cycles/blender/addon/ui.py b/intern/cycles/blender/addon/ui.py index 6f9e95dbb4c..d2d2a2038d7 100644 --- a/intern/cycles/blender/addon/ui.py +++ b/intern/cycles/blender/addon/ui.py @@ -154,7 +154,7 @@ class CyclesRender_PT_sampling(CyclesButtonsPanel, Panel): sub.prop(cscene, "subsurface_samples", text="Subsurface") sub.prop(cscene, "volume_samples", text="Volume") - if cscene.feature_set == 'EXPERIMENTAL' and use_cpu(context): + if use_cpu(context): layout.row().prop(cscene, "sampling_pattern", text="Pattern") for rl in scene.render.layers: diff --git a/intern/cycles/blender/blender_sync.cpp b/intern/cycles/blender/blender_sync.cpp index 19898bfa573..a5d6bdf1fa1 100644 --- a/intern/cycles/blender/blender_sync.cpp +++ b/intern/cycles/blender/blender_sync.cpp @@ -184,6 +184,7 @@ void BlenderSync::sync_integrator() integrator->filter_glossy = get_float(cscene, "blur_glossy"); integrator->seed = get_int(cscene, "seed"); + integrator->sampling_pattern = (SamplingPattern)RNA_enum_get(&cscene, "sampling_pattern"); integrator->layer_flag = render_layer.layer; @@ -231,10 +232,6 @@ void BlenderSync::sync_integrator() integrator->subsurface_samples = subsurface_samples; integrator->volume_samples = volume_samples; } - - - if(experimental) - integrator->sampling_pattern = (SamplingPattern)RNA_enum_get(&cscene, "sampling_pattern"); if(integrator->modified(previntegrator)) integrator->tag_update(scene); |