From e57c6bc24986f882445a77020db6f693c6e3a19e Mon Sep 17 00:00:00 2001
From: martint-unity <martint@unity3d.com>
Date: Fri, 3 Sep 2021 13:39:32 +0200
Subject: [PATCH] Removed the cookie foldout and moved into emission

---
 .../Lighting/UniversalRenderPipelineLightUI.Drawers.cs    | 8 +++-----
 .../UniversalRenderPipelineLightUI.PresetInspector.cs     | 6 +-----
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/com.unity.render-pipelines.universal/Editor/Lighting/UniversalRenderPipelineLightUI.Drawers.cs b/com.unity.render-pipelines.universal/Editor/Lighting/UniversalRenderPipelineLightUI.Drawers.cs
index 13381cfa3f3..3efb8b4fdc2 100644
--- a/com.unity.render-pipelines.universal/Editor/Lighting/UniversalRenderPipelineLightUI.Drawers.cs
+++ b/com.unity.render-pipelines.universal/Editor/Lighting/UniversalRenderPipelineLightUI.Drawers.cs
@@ -67,11 +67,7 @@ enum Expandable
             CED.FoldoutGroup(Styles.shadowHeader,
                 Expandable.Shadows,
                 k_ExpandedState,
-                DrawShadowsContent),
-            CED.FoldoutGroup(Styles.lightCookieHeader,
-                Expandable.LightCookie,
-                k_ExpandedState,
-                DrawLightCookieContent)
+                DrawShadowsContent)
         );
 
         static Func<int> s_SetGizmosDirty = SetGizmosDirty();
@@ -290,6 +286,8 @@ static void DrawEmissionContent(UniversalRenderPipelineSerializedLight serialize
 #endif
                 }
             }
+
+            DrawLightCookieContent(serializedLight, owner);
         }
 
         static void DrawRenderingContent(UniversalRenderPipelineSerializedLight serializedLight, Editor owner)
diff --git a/com.unity.render-pipelines.universal/Editor/Lighting/UniversalRenderPipelineLightUI.PresetInspector.cs b/com.unity.render-pipelines.universal/Editor/Lighting/UniversalRenderPipelineLightUI.PresetInspector.cs
index 72aeacc0ad1..e8a1bf0e8a0 100644
--- a/com.unity.render-pipelines.universal/Editor/Lighting/UniversalRenderPipelineLightUI.PresetInspector.cs
+++ b/com.unity.render-pipelines.universal/Editor/Lighting/UniversalRenderPipelineLightUI.PresetInspector.cs
@@ -23,11 +23,7 @@ partial class UniversalRenderPipelineLightUI
                 Expandable.Emission,
                 k_ExpandedStatePreset,
                 CED.Group(DrawerColor,
-                    DrawEmissionContent)),
-            CED.FoldoutGroup(Styles.lightCookieHeader,
-                Expandable.LightCookie,
-                k_ExpandedState,
-                DrawLightCookieContent)
+                    DrawEmissionContent))
         );
     }
 }