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/blender/blender_sync.cpp | |
| 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/blender/blender_sync.cpp')
| -rw-r--r-- | intern/cycles/blender/blender_sync.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/blender/blender_sync.cpp b/intern/cycles/blender/blender_sync.cpp index f6f938b6241..a0c59c4f41d 100644 --- a/intern/cycles/blender/blender_sync.cpp +++ b/intern/cycles/blender/blender_sync.cpp @@ -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; } |