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:
authorSergey Sharybin <sergey.vfx@gmail.com>2016-04-13 11:39:21 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2016-04-13 11:39:21 +0300
commit9604db76505fb832252776810edc430c9159542a (patch)
tree58637b7da1413faeb6522598d45864e84011ca5f /intern/cycles/render/integrator.cpp
parentc8e2cc21aba05278c92a8cb023b379424ca0d43e (diff)
Fix T47813: Cycles Standalone not respecting integrator sample_clamp_direct
Diffstat (limited to 'intern/cycles/render/integrator.cpp')
-rw-r--r--intern/cycles/render/integrator.cpp9
1 files changed, 9 insertions, 0 deletions
diff --git a/intern/cycles/render/integrator.cpp b/intern/cycles/render/integrator.cpp
index 47489f6e007..be8fd552e78 100644
--- a/intern/cycles/render/integrator.cpp
+++ b/intern/cycles/render/integrator.cpp
@@ -16,6 +16,7 @@
#include "device.h"
#include "integrator.h"
+#include "film.h"
#include "light.h"
#include "scene.h"
#include "shader.h"
@@ -174,6 +175,14 @@ void Integrator::device_update(Device *device, DeviceScene *dscene, Scene *scene
device->tex_alloc("__sobol_directions", dscene->sobol_directions);
+ /* Clamping. */
+ bool use_sample_clamp = (sample_clamp_direct != 0.0f ||
+ sample_clamp_indirect != 0.0f);
+ if(use_sample_clamp != scene->film->use_sample_clamp) {
+ scene->film->use_sample_clamp = use_sample_clamp;
+ scene->film->tag_update(scene);
+ }
+
need_update = false;
}