diff options
| author | Thomas Dinges <blender@dingto.org> | 2012-06-21 01:12:38 +0400 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2012-06-21 01:12:38 +0400 |
| commit | b84ee5ae7c877561f40c903c2aa83fb1031ab76a (patch) | |
| tree | a5f83b07de7bb3066d0af8e78b247ae21cfc3b12 /intern/cycles/app | |
| parent | 463a4ebf1c158c3094f9f73bcf8ce69ac5f8fbd7 (diff) | |
Cycles XML:
* Add recent integrator options.
Diffstat (limited to 'intern/cycles/app')
| -rw-r--r-- | intern/cycles/app/cycles_xml.cpp | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/intern/cycles/app/cycles_xml.cpp b/intern/cycles/app/cycles_xml.cpp index 1190ee185fd..4c1b460839e 100644 --- a/intern/cycles/app/cycles_xml.cpp +++ b/intern/cycles/app/cycles_xml.cpp @@ -254,6 +254,16 @@ static void xml_read_film(const XMLReadState& state, pugi::xml_node node) static void xml_read_integrator(const XMLReadState& state, pugi::xml_node node) { Integrator *integrator = state.scene->integrator; + + xml_read_bool(&integrator->progressive, node, "progressive"); + + if(!integrator->progressive) { + xml_read_int(&integrator->diffuse_samples, node, "diffuse_samples"); + xml_read_int(&integrator->glossy_samples, node, "glossy_samples"); + xml_read_int(&integrator->transmission_samples, node, "transmission_samples"); + xml_read_int(&integrator->ao_samples, node, "ao_samples"); + xml_read_int(&integrator->mesh_light_samples, node, "mesh_light_samples"); + } xml_read_int(&integrator->min_bounce, node, "min_bounce"); xml_read_int(&integrator->max_bounce, node, "max_bounce"); @@ -267,8 +277,10 @@ static void xml_read_integrator(const XMLReadState& state, pugi::xml_node node) xml_read_bool(&integrator->transparent_shadows, node, "transparent_shadows"); xml_read_bool(&integrator->no_caustics, node, "no_caustics"); + xml_read_float(&integrator->blur_glossy, node, "blur_glossy"); xml_read_int(&integrator->seed, node, "seed"); + xml_read_float(&integrator->sample_clamp, node, "sample_clamp"); } /* Camera */ |