diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-08-23 18:34:34 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-08-23 18:34:34 +0400 |
| commit | 01e22d1b9f3606d97f06c2d8a2bc969214322e9c (patch) | |
| tree | fcbb80481ea74c731891b5151c94b1c0b9cbb3d1 /intern/cycles/app | |
| parent | 22f48748771a96526c3abcfd6583f7cf86aa88c8 (diff) | |
Cycles: more code refactoring to rename things internally as well. Also change
property name back so we keep compatibility.
Diffstat (limited to 'intern/cycles/app')
| -rw-r--r-- | intern/cycles/app/cycles_xml.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/intern/cycles/app/cycles_xml.cpp b/intern/cycles/app/cycles_xml.cpp index 75bff4a41ed..8c6f501249a 100644 --- a/intern/cycles/app/cycles_xml.cpp +++ b/intern/cycles/app/cycles_xml.cpp @@ -252,10 +252,14 @@ 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; + bool branched = false; - xml_read_bool(&integrator->progressive, node, "progressive"); + xml_read_bool(&branched, node, "branched"); + + if(branched) + integrator->method == Integrator::BRANCHED_PATH; - if(!integrator->progressive) { + if(integrator->method == Integrator::BRANCHED_PATH) { 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"); |