Commit: 0808eaf44e8130a902e31178848c74e4a47fb677 Author: Brecht Van Lommel Date: Mon Dec 5 21:40:49 2022 +0100 Branches: master https://developer.blender.org/rB0808eaf44e8130a902e31178848c74e4a47fb677
Cycles: temporarily disable light tree again due to platform differences Regression tests are failing with some platform/compiler combinations, and fixing this is taking some time. 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 d0d66d09442..28828266746 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 f8be1b210b8..7fb5f70e590 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 = get_boolean(cscene, "use_light_tree"); + bool use_light_tree = false; // 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")); _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org List details, subscription details or unsubscribe: https://lists.blender.org/mailman/listinfo/bf-blender-cvs