From 928f49fd6afe0f5ee4cc3835f8486f09f31a1110 Mon Sep 17 00:00:00 2001 From: Patrick Murphy Date: Fri, 3 Oct 2025 11:31:23 -0400 Subject: [PATCH] Fix issue in 6000.1 where ForwardPLus keyworld was replaced with ClusterLightLoop In 6000.1 the CoreKeywordDescriptor.ForwardPlus (_FORWARD_PLUS) was replaced with CoreKeywordDescriptor.ClusterLightLoop (_CLUSTER_LIGHT_LOOP) Documentation can be found here 6000.1: https://docs.unity3d.com/6000.1/Documentation/Manual/urp/urp-shaders/shader-keywords-macros.html 6000.0: https://docs.unity3d.com/6000.0/Documentation/Manual/urp/urp-shaders/shader-keywords-macros.html --- Editor/ShaderGraph/Targets/UniversalSimpleLitSubTarget.cs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Editor/ShaderGraph/Targets/UniversalSimpleLitSubTarget.cs b/Editor/ShaderGraph/Targets/UniversalSimpleLitSubTarget.cs index 59a66de..90f3006 100644 --- a/Editor/ShaderGraph/Targets/UniversalSimpleLitSubTarget.cs +++ b/Editor/ShaderGraph/Targets/UniversalSimpleLitSubTarget.cs @@ -872,8 +872,10 @@ static class SimpleLitKeywords { CoreKeywordDescriptors.LightLayers }, { CoreKeywordDescriptors.DebugDisplay }, { CoreKeywordDescriptors.LightCookies }, -#if UNITY_2022_2_OR_NEWER - { CoreKeywordDescriptors.ForwardPlus }, +#if UNITY_6000_1_OR_NEWER + { CoreKeywordDescriptors.ClusterLightLoop }, +#elif UNITY_2022_2_OR_NEWER + { CoreKeywordDescriptors.ForwardPlus }, #else { CoreKeywordDescriptors.ClusteredRendering }, #endif