archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages 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

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

@@ -189,7 +189,7 @@ void BlenderSync::sync_integrator()
}
#endif
integrator->progressive = get_int(cscene, "integrator") == 1;
integrator->method = (Integrator::Method)get_int(cscene, "progressive");
int diffuse_samples = get_int(cscene, "diffuse_samples");
int glossy_samples = get_int(cscene, "glossy_samples");
@@ -420,7 +420,7 @@ SessionParams BlenderSync::get_session_params(BL::RenderEngine b_engine, BL::Use
preview_samples = preview_samples * preview_samples;
}
if(get_int(cscene, "integrator") == 0) {
if(get_int(cscene, "progressive") == 0) {
if(background) {
params.samples = aa_samples;
}