Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@pandora.be>2013-08-23 18:34:34 +0400
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2013-08-23 18:34:34 +0400
commit01e22d1b9f3606d97f06c2d8a2bc969214322e9c (patch)
treefcbb80481ea74c731891b5151c94b1c0b9cbb3d1 /intern/cycles/render/session.cpp
parent22f48748771a96526c3abcfd6583f7cf86aa88c8 (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/render/session.cpp')
-rw-r--r--intern/cycles/render/session.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/render/session.cpp b/intern/cycles/render/session.cpp
index b4dad436edb..01f8a950c8f 100644
--- a/intern/cycles/render/session.cpp
+++ b/intern/cycles/render/session.cpp
@@ -830,7 +830,7 @@ void Session::path_trace()
task.update_tile_sample = function_bind(&Session::update_tile_sample, this, _1);
task.update_progress_sample = function_bind(&Session::update_progress_sample, this);
task.need_finish_queue = params.progressive_refine;
- task.integrator_progressive = scene->integrator->progressive;
+ task.integrator_branched = scene->integrator->method == Integrator::BRANCHED_PATH;
device->task_add(task);
}