[Bf-blender-cvs] [c9d7d9a747b] cycles-x: Fix wrong behavior with automatic adaptive sampling threshold 0.0

[Brecht Van Lommel]

Commit: c9d7d9a747b846914ca90b9fc515eee2cfe8c4e8
Author: Brecht Van Lommel
Date:   Wed Sep 8 17:08:27 2021 +0200
Branches: cycles-x
https://developer.blender.org/rBc9d7d9a747b846914ca90b9fc515eee2cfe8c4e8

Fix wrong behavior with automatic adaptive sampling threshold 0.0

===================================================================

M	intern/cycles/render/integrator.cpp

===================================================================

diff --git a/intern/cycles/render/integrator.cpp b/intern/cycles/render/integrator.cpp
index 7263609339d..35a61a663cc 100644
--- a/intern/cycles/render/integrator.cpp
+++ b/intern/cycles/render/integrator.cpp
@@ -292,9 +292,9 @@ AdaptiveSampling Integrator::get_adaptive_sampling() const
     adaptive_sampling.threshold = adaptive_threshold;
   }
 
-  if (adaptive_threshold > 0 && adaptive_min_samples == 0) {
+  if (adaptive_sampling.threshold > 0 && adaptive_min_samples == 0) {
     /* Threshold 0.1 -> 32, 0.01 -> 64, 0.001 -> 128. */
-    const int min_samples = (int)ceilf(16.0f / sqrtf(adaptive_threshold * 0.3f));
+    const int min_samples = (int)ceilf(16.0f / sqrtf(adaptive_sampling.threshold * 0.3f));
     adaptive_sampling.min_samples = max(4, min_samples);
     VLOG(1) << "Cycles adaptive sampling: automatic min samples = "
             << adaptive_sampling.min_samples;