Move Clay properties into scene

Per collection overrides are gone now.

1 files changed, 10 insertions, 22 deletions

diff --git a/release/scripts/startup/bl_ui/properties_render.py b/release/scripts/startup/bl_ui/properties_render.py
index 170f2627af5..93de404245f 100644
--- a/release/scripts/startup/bl_ui/properties_render.py
+++ b/release/scripts/startup/bl_ui/properties_render.py
@@ -431,25 +431,13 @@ class RENDER_PT_stereoscopy(RenderButtonsPanel, Panel):
             row.prop(rv, "camera_suffix", text="")
 
 
-class RENDER_PT_clay_layer_settings(RenderButtonsPanel, Panel):
-    bl_label = "Clay Layer Settings"
+class RENDER_PT_clay_settings(RenderButtonsPanel, Panel):
+    bl_label = "Clay Settings"
     COMPAT_ENGINES = {'BLENDER_CLAY'}
 
     def draw(self, context):
         layout = self.layout
-        props = context.scene.layer_properties['BLENDER_CLAY']
-
-        col = layout.column()
-        col.prop(props, "ssao_samples")
-
-
-class RENDER_PT_clay_collection_settings(RenderButtonsPanel, Panel):
-    bl_label = "Clay Collection Settings"
-    COMPAT_ENGINES = {'BLENDER_CLAY'}
-
-    def draw(self, context):
-        layout = self.layout
-        props = context.scene.collection_properties['BLENDER_CLAY']
+        props = context.scene.display
 
         col = layout.column()
         col.template_icon_view(props, "matcap_icon")
@@ -457,11 +445,12 @@ class RENDER_PT_clay_collection_settings(RenderButtonsPanel, Panel):
         col.prop(props, "matcap_hue")
         col.prop(props, "matcap_saturation")
         col.prop(props, "matcap_value")
-        col.prop(props, "ssao_factor_cavity")
-        col.prop(props, "ssao_factor_edge")
-        col.prop(props, "ssao_distance")
-        col.prop(props, "ssao_attenuation")
-        col.prop(props, "hair_brightness_randomness")
+        col.prop(props, "matcap_ssao_samples")
+        col.prop(props, "matcap_ssao_factor_cavity")
+        col.prop(props, "matcap_ssao_factor_edge")
+        col.prop(props, "matcap_ssao_distance")
+        col.prop(props, "matcap_ssao_attenuation")
+        col.prop(props, "matcap_hair_brightness_randomness")
 
 
 class RENDER_PT_eevee_ambient_occlusion(RenderButtonsPanel, Panel):
@@ -756,8 +745,7 @@ classes = (
     RENDER_PT_encoding,
     RENDER_UL_renderviews,
     RENDER_PT_stereoscopy,
-    RENDER_PT_clay_layer_settings,
-    RENDER_PT_clay_collection_settings,
+    RENDER_PT_clay_settings,
     RENDER_PT_eevee_sampling,
     RENDER_PT_eevee_film,
     RENDER_PT_eevee_shadows,