kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Cycles: Make Correlated Multi Jitter a regular feature.

Browse Source 
It can be helpful in some cases and it works properly, so no need to hide it behind the experimental flag anymore. It's only enabled for the CPU though.
This commit is contained in:
Thomas Dinges 2014-08-26 03:45:24 +02:00
parent 0a48cf08da
commit e2c412f8cc
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
intern/cycles/blender/addon/ui.py
View File

@ -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:

5
intern/cycles/blender/blender_sync.cpp
View File

@ -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;
@ -232,10 +233,6 @@ void BlenderSync::sync_integrator()
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);
}