[Fix] Fix to light options processing causing clustered shaders compi…

…lation when lights change (#4955) Co-authored-by: Martin Valigursky <mvaligursky@snapchat.com>
playcanvas · Jan 9, 2023 · 4199b6d · 4199b6d
1 parent 9db2ced
commit 4199b6d
Showing 1 changed file with 13 additions and 8 deletions.
diff --git a/src/scene/shader-lib/programs/standard.js b/src/scene/shader-lib/programs/standard.js
@@ -59,15 +59,20 @@ const standard = {
         }
 
         if (options.litOptions) {
-            for (const m in options.litOptions)
-                key += m + options.litOptions[m];
-            if (options.litOptions.lights) {
-                const isClustered = options.litOptions.clusteredLightingEnabled;
-                for (let i = 0; i < options.litOptions.lights.length; i++) {
-                    const light = options.litOptions.lights[i];
-                    if (!isClustered || light._type === LIGHTTYPE_DIRECTIONAL) {
-                        key += light.key;
+
+            for (const m in options.litOptions) {
+
+                // handle lights in a custom way
+                if (m === 'lights') {
+                    const isClustered = options.litOptions.clusteredLightingEnabled;
+                    for (let i = 0; i < options.litOptions.lights.length; i++) {
+                        const light = options.litOptions.lights[i];
+                        if (!isClustered || light._type === LIGHTTYPE_DIRECTIONAL) {
+                            key += light.key;
+                        }
                     }
+                } else {
+                    key += m + options.litOptions[m];
                 }
             }
         }