[Bf-blender-cvs] [5f124b0838d] soc-2020-production-ready-light-tree: Decoupled splitting from branched path integrator.

[Sam Kottler]

Commit: 5f124b0838d4c4768e5cfd44edeefdc9a591eec6
Author: Sam Kottler
Date:   Thu Jul 2 09:24:15 2020 -0600
Branches: soc-2020-production-ready-light-tree
https://developer.blender.org/rB5f124b0838d4c4768e5cfd44edeefdc9a591eec6

Decoupled splitting from branched path integrator.

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

M	intern/cycles/blender/blender_sync.cpp
M	intern/cycles/kernel/kernel_path_surface.h
M	release/datafiles/locale
M	release/scripts/addons
M	release/scripts/addons_contrib

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

diff --git a/intern/cycles/blender/blender_sync.cpp b/intern/cycles/blender/blender_sync.cpp
index bfadc861c77..4eb9b9d49fa 100644
--- a/intern/cycles/blender/blender_sync.cpp
+++ b/intern/cycles/blender/blender_sync.cpp
@@ -292,12 +292,7 @@ void BlenderSync::sync_integrator()
       cscene, "progressive", Integrator::NUM_METHODS, Integrator::PATH);
 
   integrator->use_light_tree = get_boolean(cscene, "use_light_tree");
-  if (get_enum(cscene, "progressive") == 0) {
-    integrator->splitting_threshold = get_float(cscene, "splitting_threshold");
-  }
-  else {  // Not using branched path tracing
-    integrator->splitting_threshold = 0.0f;
-  }
+  integrator->splitting_threshold = get_float(cscene, "splitting_threshold");
   integrator->sample_all_lights_direct = get_boolean(cscene, "sample_all_lights_direct");
   integrator->sample_all_lights_indirect = get_boolean(cscene, "sample_all_lights_indirect");
   integrator->light_sampling_threshold = get_float(cscene, "light_sampling_threshold");
diff --git a/intern/cycles/kernel/kernel_path_surface.h b/intern/cycles/kernel/kernel_path_surface.h
index 09672f542da..f8bc9fd7240 100644
--- a/intern/cycles/kernel/kernel_path_surface.h
+++ b/intern/cycles/kernel/kernel_path_surface.h
@@ -242,8 +242,7 @@ ccl_device_noinline_cpu void kernel_branched_path_surface_connect_light(
   BsdfEval L_light ccl_optional_struct_init;
 
   bool use_light_tree = kernel_data.integrator.use_light_tree;
-  bool use_splitting = kernel_data.integrator.splitting_threshold != 0.0f;
-  if (use_light_tree && use_splitting) {
+  if (use_light_tree) {
     Ray light_ray;
     bool is_lamp;
 
diff --git a/release/datafiles/locale b/release/datafiles/locale
index 72e5040232a..f1ab6e28bf1 160000
--- a/release/datafiles/locale
+++ b/release/datafiles/locale
@@ -1 +1 @@
-Subproject commit 72e5040232a544b293dca05dac5707bd4e4bffaf
+Subproject commit f1ab6e28bf1626daf898fc65e144f1e4e4f2098a
diff --git a/release/scripts/addons b/release/scripts/addons
index ca6405bac34..f1f69a63e0f 160000
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@ -1 +1 @@
-Subproject commit ca6405bac34ebf2122bd37a5ad40c03b4bb30f33
+Subproject commit f1f69a63e0fb0f3079a9895e34aa56ae9b070789
diff --git a/release/scripts/addons_contrib b/release/scripts/addons_contrib
index 7c36b48507f..45aa940dabd 160000
--- a/release/scripts/addons_contrib
+++ b/release/scripts/addons_contrib
@@ -1 +1 @@
-Subproject commit 7c36b48507f79ca62f8c038bad0fb3468c4f48e2
+Subproject commit 45aa940dabda64f7877c6d5dd843998a86f0a836