[Bf-blender-cvs] [2305fdfaa19] soc-2020-production-ready-light-tree: Made Light Tree an experimental feature
Sam Kottler
noreply at git.blender.org
Fri Jun 5 22:43:23 CEST 2020
Commit: 2305fdfaa196fb5b46f972e7684917e3e8dad5b7
Author: Sam Kottler
Date: Thu Jun 4 10:01:06 2020 -0600
Branches: soc-2020-production-ready-light-tree
https://developer.blender.org/rB2305fdfaa196fb5b46f972e7684917e3e8dad5b7
Made Light Tree an experimental feature
===================================================================
M intern/cycles/blender/addon/ui.py
===================================================================
diff --git a/intern/cycles/blender/addon/ui.py b/intern/cycles/blender/addon/ui.py
index 28975ccfe15..81fe3c4de19 100644
--- a/intern/cycles/blender/addon/ui.py
+++ b/intern/cycles/blender/addon/ui.py
@@ -297,14 +297,34 @@ class CYCLES_RENDER_PT_sampling_advanced(CyclesButtonsPanel, Panel):
layout.row().prop(cscene, "use_layer_samples")
break
- row = layout.row(align=True)
- row.label(text="Experimental:")
- row.prop(cscene, "use_light_tree", text="Light Tree")
- if cscene.use_light_tree and use_branched_path(context):
- row = layout.row(align=True)
- row.label(text="") # create empty column
- row.prop(cscene, "splitting_threshold", text="Splitting")
+class CYCLES_RENDER_PT_sampling_light_tree(CyclesButtonsPanel, Panel):
+ bl_label = "Light Tree"
+ bl_parent_id = "CYCLES_RENDER_PT_sampling"
+ bl_options = {'DEFAULT_CLOSED'}
+
+ @classmethod
+ def poll(cls, context):
+ return (context.scene.cycles.feature_set == 'EXPERIMENTAL')
+
+ def draw_header(self, context):
+ layout = self.layout
+ scene = context.scene
+ cscene = scene.cycles
+ layout.prop(cscene, "use_light_tree", text="")
+
+ def draw(self, context):
+ layout = self.layout
+ layout.use_property_split = True
+ layout.use_property_decorate = False
+
+ scene = context.scene
+ cscene = scene.cycles
+
+ layout.active = cscene.use_light_tree
+ row = layout.row(align=True)
+ row.label(text="") # create empty column
+ row.prop(cscene, "splitting_threshold", text="Splitting")
class CYCLES_RENDER_PT_sampling_total(CyclesButtonsPanel, Panel):
bl_label = "Total Samples"
@@ -2257,6 +2277,7 @@ classes = (
CYCLES_RENDER_PT_sampling_sub_samples,
CYCLES_RENDER_PT_sampling_adaptive,
CYCLES_RENDER_PT_sampling_advanced,
+ CYCLES_RENDER_PT_sampling_light_tree,
CYCLES_RENDER_PT_light_paths,
CYCLES_RENDER_PT_light_paths_max_bounces,
CYCLES_RENDER_PT_light_paths_clamping,
More information about the Bf-blender-cvs
mailing list