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:
Diffstat (limited to 'intern/cycles/render/session.cpp')
-rw-r--r--intern/cycles/render/session.cpp13
1 files changed, 13 insertions, 0 deletions
diff --git a/intern/cycles/render/session.cpp b/intern/cycles/render/session.cpp
index bc847d5719c..44364418dcf 100644
--- a/intern/cycles/render/session.cpp
+++ b/intern/cycles/render/session.cpp
@@ -22,6 +22,7 @@
#include "buffers.h"
#include "camera.h"
#include "device.h"
+#include "integrator.h"
#include "scene.h"
#include "session.h"
@@ -728,6 +729,18 @@ void Session::update_scene()
cam->tag_update();
}
+ /* number of samples is needed by multi jittered sampling pattern */
+ Integrator *integrator = scene->integrator;
+
+ if(integrator->sampling_pattern == SAMPLING_PATTERN_CMJ) {
+ int aa_samples = tile_manager.num_samples;
+
+ if(aa_samples != integrator->aa_samples) {
+ integrator->aa_samples = aa_samples;
+ integrator->tag_update(scene);
+ }
+ }
+
/* update scene */
if(scene->need_update()) {
progress.set_status("Updating Scene");