[Bf-blender-cvs] [040b78e4ca5] soc-2020-production-ready-light-tree: Fixed inconsisancy causing calling direct_emission twice from merge.

[Sam Kottler]

Commit: 040b78e4ca543cb2d209bca8fe8e83c53fd59c41
Author: Sam Kottler
Date:   Tue Jun 9 16:59:54 2020 -0600
Branches: soc-2020-production-ready-light-tree
https://developer.blender.org/rB040b78e4ca543cb2d209bca8fe8e83c53fd59c41

Fixed inconsisancy causing calling direct_emission twice from merge.

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

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/kernel/kernel_path_surface.h b/intern/cycles/kernel/kernel_path_surface.h
index 9047d57ee16..24421c4bdc0 100644
--- a/intern/cycles/kernel/kernel_path_surface.h
+++ b/intern/cycles/kernel/kernel_path_surface.h
@@ -507,7 +507,6 @@ ccl_device_inline void kernel_path_surface_connect_light(KernelGlobals *kg,
   Ray light_ray ccl_optional_struct_init;
   BsdfEval L_light ccl_optional_struct_init;
   bool is_lamp = false;
-  bool has_emission = false;
 
   light_ray.t = 0.0f;
 #    ifdef __OBJECT_MOTION__
@@ -531,31 +530,21 @@ ccl_device_inline void kernel_path_surface_connect_light(KernelGlobals *kg,
                      &ls,
                      has_volume)) {
       float terminate = path_state_rng_light_termination(kg, state);
-      has_emission = direct_emission(
-          kg, sd, emission_sd, &ls, state, &light_ray, &L_light, &is_lamp, terminate);
+      accum_light_contribution(kg,
+                               sd,
+                               emission_sd,
+                               &ls,
+                               state,
+                               &light_ray,
+                               &L_light,
+                               L,
+                               &is_lamp,
+                               terminate,
+                               throughput,
+                               1.0f);
     }
   }
 
-  /* trace shadow ray */
-  float3 shadow;
-
-  const bool blocked = shadow_blocked(kg, sd, emission_sd, state, &light_ray, &shadow);
-
-  if (has_emission) {
-    /* accumulate */
-    accum_light_contribution(kg,
-                             sd,
-                             emission_sd,
-                             &ls,
-                             state,
-                             &light_ray,
-                             &L_light,
-                             L,
-                             &is_lamp,
-                             terminate,
-                             throughput,
-                             1.0f);
-  }
 #  endif
 #endif
 }
diff --git a/release/datafiles/locale b/release/datafiles/locale
index 1cc27d5282a..6a514935090 160000
--- a/release/datafiles/locale
+++ b/release/datafiles/locale
@@ -1 +1 @@
-Subproject commit 1cc27d5282aa4978ee36663aca857eb550df194b
+Subproject commit 6a51493509090c7fa3bd2e69105761c3c144c7dd
diff --git a/release/scripts/addons b/release/scripts/addons
index 36cc6368b7a..084eec36977 160000
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@ -1 +1 @@
-Subproject commit 36cc6368b7abee3bc1a47759107797117eb7d539
+Subproject commit 084eec36977c9a084aa020031f4a1aa0f0352170
diff --git a/release/scripts/addons_contrib b/release/scripts/addons_contrib
index 9468c406fb5..4cf486c4eba 160000
--- a/release/scripts/addons_contrib
+++ b/release/scripts/addons_contrib
@@ -1 +1 @@
-Subproject commit 9468c406fb554e32ff47b62bfef356b3908ec651
+Subproject commit 4cf486c4eba158b453bdd87d97b74192ef7497b2