diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-12-28 20:37:05 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-12-28 20:59:33 +0300 |
| commit | 3f4e3f718fdc1163cc52a84d85978fa94b230211 (patch) | |
| tree | 21bdaae3f63721ac481493a58d9abd37395243ce /intern/cycles/blender/blender_session.cpp | |
| parent | a7c5f4f20657e12b43337e32bc62a876cbbe6292 (diff) | |
Cycles: restore old sample and material override settings for view layers.
Since there will be no view layer overrides in 2.80, this is needed still.
Diffstat (limited to 'intern/cycles/blender/blender_session.cpp')
| -rw-r--r-- | intern/cycles/blender/blender_session.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/intern/cycles/blender/blender_session.cpp b/intern/cycles/blender/blender_session.cpp index 58d3b57a67e..f84eefd0233 100644 --- a/intern/cycles/blender/blender_session.cpp +++ b/intern/cycles/blender/blender_session.cpp @@ -481,13 +481,15 @@ void BlenderSession::render(BL::Depsgraph& b_depsgraph_) scene->integrator->tag_update(scene); } - int effective_layer_samples = session_params.samples; + /* Update number of samples per layer. */ + int samples = sync->get_layer_samples(); + bool bound_samples = sync->get_layer_bound_samples(); + int effective_layer_samples; - /* TODO: Update number of samples per layer. */ -#if 0 if(samples != 0 && (!bound_samples || (samples < session_params.samples))) effective_layer_samples = samples; -#endif + else + effective_layer_samples = session_params.samples; /* Update tile manager if we're doing resumable render. */ update_resumable_tile_manager(effective_layer_samples); |