diff options
author | Thomas Dinges <blender@dingto.org> | 2014-02-11 17:14:13 +0400 |
---|---|---|
committer | Thomas Dinges <blender@dingto.org> | 2014-02-11 17:14:43 +0400 |
commit | 5a35034fb3b046986a06837692bfa6c225f27878 (patch) | |
tree | 15a4431cb032a9a98dd79328dd4e16444207eff6 /intern/cycles/blender/blender_sync.cpp | |
parent | 4bf4c4111e63466c42987e185d8f2e09d7b17186 (diff) |
Fix Cycles Light Passes being always enabled, own regression in Clamp commit yesterday.
KernelIntegrator just doesn't have valid data at this point, so we need to go one level deeper.
Diffstat (limited to 'intern/cycles/blender/blender_sync.cpp')
-rw-r--r-- | intern/cycles/blender/blender_sync.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/intern/cycles/blender/blender_sync.cpp b/intern/cycles/blender/blender_sync.cpp index 4415940b359..d21ffdec0d1 100644 --- a/intern/cycles/blender/blender_sync.cpp +++ b/intern/cycles/blender/blender_sync.cpp @@ -240,6 +240,10 @@ void BlenderSync::sync_film() Film *film = scene->film; Film prevfilm = *film; + + /* Clamping */ + Integrator *integrator = scene->integrator; + film->use_sample_clamp = (integrator->sample_clamp_direct != 0.0f || integrator->sample_clamp_indirect != 0.0f); film->exposure = get_float(cscene, "film_exposure"); film->filter_type = (FilterType)RNA_enum_get(&cscene, "filter_type"); |