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

Cycles: more code refactoring to rename things internally as well. Also change

Browse Source 
property name back so we keep compatibility.
This commit is contained in:
Brecht Van Lommel
2013-08-23 14:34:34 +00:00
parent 22f4874877
commit 01e22d1b9f
17 changed files with 71 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
intern/cycles/app/cycles_xml.cpp
View File

@@ -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");