[Bf-blender-cvs] [7d99c51e17c] master: Cycles: enable light tree again

[Brecht Van Lommel]

Commit: 7d99c51e17c4722949a90c5992cebd203246527f
Author: Brecht Van Lommel
Date:   Tue Dec 6 17:35:12 2022 +0100
Branches: master
https://developer.blender.org/rB7d99c51e17c4722949a90c5992cebd203246527f

Cycles: enable light tree again

Bugs that caused wrong renders should be fixed now, and tests that showed minor
floating point differences on platforms were tweaked to sidestep the problem.

Ref T77889

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

M	intern/cycles/blender/addon/ui.py
M	intern/cycles/blender/sync.cpp

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

diff --git a/intern/cycles/blender/addon/ui.py b/intern/cycles/blender/addon/ui.py
index 28828266746..d0d66d09442 100644
--- a/intern/cycles/blender/addon/ui.py
+++ b/intern/cycles/blender/addon/ui.py
@@ -410,10 +410,10 @@ class CYCLES_RENDER_PT_sampling_lights(CyclesButtonsPanel, Panel):
         cscene = scene.cycles
 
         col = layout.column(align=True)
-        #col.prop(cscene, "use_light_tree")
+        col.prop(cscene, "use_light_tree")
         sub = col.row()
         sub.prop(cscene, "light_sampling_threshold", text="Light Threshold")
-        #sub.active = not cscene.use_light_tree
+        sub.active = not cscene.use_light_tree
 
 
 class CYCLES_RENDER_PT_subdivision(CyclesButtonsPanel, Panel):
diff --git a/intern/cycles/blender/sync.cpp b/intern/cycles/blender/sync.cpp
index 7fb5f70e590..f8be1b210b8 100644
--- a/intern/cycles/blender/sync.cpp
+++ b/intern/cycles/blender/sync.cpp
@@ -347,7 +347,7 @@ void BlenderSync::sync_integrator(BL::ViewLayer &b_view_layer, bool background)
     integrator->set_motion_blur(view_layer.use_motion_blur);
   }
 
-  bool use_light_tree = false;  // get_boolean(cscene, "use_light_tree");
+  bool use_light_tree = get_boolean(cscene, "use_light_tree");
   integrator->set_use_light_tree(use_light_tree);
   integrator->set_light_sampling_threshold(
       (use_light_tree) ? 0.0f : get_float(cscene, "light_sampling_threshold"));