[Bf-blender-cvs] [bf4d5f8ea94] temp-trimesh-sculpt: Merge branch 'master' of git://git.blender.org/blender

[Joseph Eagar]

Commit: bf4d5f8ea948d6d7f35b0f614b7eb43afbf48c47
Author: Joseph Eagar
Date:   Mon Mar 9 19:12:45 2020 -0700
Branches: temp-trimesh-sculpt
https://developer.blender.org/rBbf4d5f8ea948d6d7f35b0f614b7eb43afbf48c47

Merge branch 'master' of git://git.blender.org/blender

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



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

diff --cc intern/cycles/blender/addon/properties.py
index 623bebc71bb,1a93a603e23..dbbe8e4900f
--- a/intern/cycles/blender/addon/properties.py
+++ b/intern/cycles/blender/addon/properties.py
@@@ -264,16 -261,6 +261,11 @@@ class CyclesRenderSettings(bpy.types.Pr
          min=0, max=(1 << 24),
          default=32,
      )
 +    preview_pause: BoolProperty(
 +        name="Pause Preview",
 +        description="Pause all viewport preview renders",
 +        default=False,
 +    )
-     use_light_bounce: BoolProperty(
-         name="Cache Light Bounce",
-         description="Cache first light bounce",
-         default=False,
-     )
      aa_samples: IntProperty(
          name="AA Samples",
          description="Number of antialiasing samples to render for each pixel",
diff --cc intern/cycles/render/integrator.cpp
index 8f97ae2b788,ee1aa5988bf..27c6ed9c907
--- a/intern/cycles/render/integrator.cpp
+++ b/intern/cycles/render/integrator.cpp
@@@ -176,7 -182,22 +182,23 @@@ void Integrator::device_update(Device *
  
    kintegrator->sampling_pattern = sampling_pattern;
    kintegrator->aa_samples = aa_samples;
-   kintegrator->use_light_bounce = use_light_bounce;
++
+   if (aa_samples > 0 && adaptive_min_samples == 0) {
+     kintegrator->adaptive_min_samples = max(4, (int)sqrtf(aa_samples));
+     VLOG(1) << "Cycles adaptive sampling: automatic min samples = "
+             << kintegrator->adaptive_min_samples;
+   }
+   else {
+     kintegrator->adaptive_min_samples = max(4, adaptive_min_samples);
+   }
+   if (aa_samples > 0 && adaptive_threshold == 0.0f) {
+     kintegrator->adaptive_threshold = max(0.001f, 1.0f / (float)aa_samples);
+     VLOG(1) << "Cycles adaptive sampling: automatic threshold = "
+             << kintegrator->adaptive_threshold;
+   }
+   else {
+     kintegrator->adaptive_threshold = adaptive_threshold;
+   }
  
    if (light_sampling_threshold > 0.0f) {
      kintegrator->light_inv_rr_threshold = 1.0f / light_sampling_threshold;
diff --cc release/datafiles/locale
index 34d98762cef,2a25e004396..0cbba701783
--- a/release/datafiles/locale
+++ b/release/datafiles/locale
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit 34d98762cef85b9c065f21a051d1dbe3bf2979b7
 -Subproject commit 2a25e004396d3f135a98da132b496923275a3dcc
++Subproject commit 0cbba70178397662c87c1f5015af6dadd8ecdfc3
diff --cc release/scripts/addons
index 47a32a5370d,7f50343d1c5..670da1eea44
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit 47a32a5370d36942674621e5a03e57e8dd4986d8
 -Subproject commit 7f50343d1c53ca9a5ca747f47e3b1e5bbcbe8471
++Subproject commit 670da1eea44d27200c9bd1fb6aacac4cf5daa52f
diff --cc source/tools
index 603f076606f,4a6f1706258..d230f2161f3
--- a/source/tools
+++ b/source/tools
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit 603f076606f052adc97d937633bfeb9b268ec202
 -Subproject commit 4a6f1706258439db3ee5a50ec6938fef79c7cb97
++Subproject commit d230f2161f36f8b21f3ce8eeb19b34c0629506c2