[Bf-blender-cvs] [cf6d4d5757f] cycles_path_guiding: Cycles-X: Path Guiding: Moving ui settings to the Sampling section and renamed Guiding to Path Guiding

[Sebastian Herholz]

Commit: cf6d4d5757f430a6571e09deba5657703dd71622
Author: Sebastian Herholz
Date:   Mon Jul 25 12:35:00 2022 +0200
Branches: cycles_path_guiding
https://developer.blender.org/rBcf6d4d5757f430a6571e09deba5657703dd71622

Cycles-X: Path Guiding: Moving ui settings to the Sampling section and renamed Guiding to Path Guiding

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

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

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

diff --git a/intern/cycles/blender/addon/ui.py b/intern/cycles/blender/addon/ui.py
index f8071ce4c60..19b72911a87 100644
--- a/intern/cycles/blender/addon/ui.py
+++ b/intern/cycles/blender/addon/ui.py
@@ -311,6 +311,45 @@ class CYCLES_RENDER_PT_sampling_advanced(CyclesButtonsPanel, Panel):
                 break
 
 
+class CYCLES_RENDER_PT_sampling_path_guiding(CyclesButtonsPanel, Panel):
+    bl_label = "Path Guiding"
+    bl_parent_id = "CYCLES_RENDER_PT_sampling"
+
+    @classmethod
+    def poll(cls, context):
+        from . import engine
+        return use_cpu(context) and engine.with_path_guiding()
+
+    def draw_header(self, context):
+        scene = context.scene
+        cscene = scene.cycles
+
+        self.layout.prop(cscene, "use_guiding", text="")
+
+    def draw(self, context):
+        scene = context.scene
+        cscene = scene.cycles
+
+        experimentalView = context.scene.cycles.feature_set == 'EXPERIMENTAL'
+
+        layout = self.layout
+        layout.use_property_split = True
+        layout.use_property_decorate = False
+        layout.active = cscene.use_guiding
+
+        col = layout.column(align=True)
+        if experimentalView:
+            col.prop(cscene, "guiding_distribution_type", text="Distribution Type")
+        col.prop(cscene, "use_surface_guiding", text="Surface Guiding")
+        if experimentalView:
+            col.prop(cscene, "surface_guiding_probability", text="Surface Guiding Probability")
+        col.prop(cscene, "use_volume_guiding", text="Volume Guiding")
+        if experimentalView:
+            col.prop(cscene, "volume_guiding_probability", text="Volume Guiding Probability")
+            col.prop(cscene, "use_guide_direct_light", text="Guide Direct Light")
+            col.prop(cscene, "use_mis_weights", text="Use MIS Weights")
+
+
 class CYCLES_RENDER_PT_subdivision(CyclesButtonsPanel, Panel):
     bl_label = "Subdivision"
     bl_options = {'DEFAULT_CLOSED'}
@@ -458,45 +497,6 @@ class CYCLES_RENDER_PT_light_paths_caustics(CyclesButtonsPanel, Panel):
         col.prop(cscene, "caustics_refractive", text="Refractive")
 
 
-class CYCLES_RENDER_PT_light_paths_guiding(CyclesButtonsPanel, Panel):
-    bl_label = "Guiding"
-    bl_parent_id = "CYCLES_RENDER_PT_light_paths"
-
-    @classmethod
-    def poll(cls, context):
-        from . import engine
-        return use_cpu(context) and engine.with_path_guiding()
-
-    def draw_header(self, context):
-        scene = context.scene
-        cscene = scene.cycles
-
-        self.layout.prop(cscene, "use_guiding", text="")
-
-    def draw(self, context):
-        scene = context.scene
-        cscene = scene.cycles
-
-        experimentalView = context.scene.cycles.feature_set == 'EXPERIMENTAL'
-
-        layout = self.layout
-        layout.use_property_split = True
-        layout.use_property_decorate = False
-        layout.active = cscene.use_guiding
-
-        col = layout.column(align=True)
-        if experimentalView:
-            col.prop(cscene, "guiding_distribution_type", text="Distribution Type")
-        col.prop(cscene, "use_surface_guiding", text="Surface Guiding")
-        if experimentalView:
-            col.prop(cscene, "surface_guiding_probability", text="Surface Guiding Probability")
-        col.prop(cscene, "use_volume_guiding", text="Volume Guiding")
-        if experimentalView:
-            col.prop(cscene, "volume_guiding_probability", text="Volume Guiding Probability")
-            col.prop(cscene, "use_guide_direct_light", text="Guide Direct Light")
-            col.prop(cscene, "use_mis_weights", text="Use MIS Weights")
-
-
 class CYCLES_RENDER_PT_light_paths_fast_gi(CyclesButtonsPanel, Panel):
     bl_label = "Fast GI Approximation"
     bl_options = {'DEFAULT_CLOSED'}
@@ -2308,9 +2308,9 @@ classes = (
     CYCLES_RENDER_PT_sampling_render,
     CYCLES_RENDER_PT_sampling_render_denoise,
     CYCLES_RENDER_PT_sampling_advanced,
+    CYCLES_RENDER_PT_sampling_path_guiding,
     CYCLES_RENDER_PT_light_paths,
     CYCLES_RENDER_PT_light_paths_max_bounces,
-    CYCLES_RENDER_PT_light_paths_guiding,
     CYCLES_RENDER_PT_light_paths_clamping,
     CYCLES_RENDER_PT_light_paths_caustics,
     CYCLES_RENDER_PT_light_paths_fast_gi,