Merge pull request #197 from Smithsonian/dev-bugfix

Bug fix for dispose call with multiple scenes on page
Smithsonian · Mar 1, 2023 · edb8bed · edb8bed
2 parents fb2c1b5 + 8d5a987
commit edb8bed
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/source/client/components/CVDirectionalLight.ts b/source/client/components/CVDirectionalLight.ts
@@ -50,7 +50,7 @@ export default class CVDirectionalLight extends CDirectionalLight implements ICV
     }
 
     dispose(): void {
-        if(this.ins.shadowEnabled.value) {
+        if(this.ins.shadowEnabled.value && this.light.shadow.map) {
             this.light.shadow.map.dispose();
         }
 

diff --git a/source/client/components/CVPointLight.ts b/source/client/components/CVPointLight.ts
@@ -51,7 +51,7 @@ export default class CVPointLight extends CPointLight implements ICVLight
     }
 
     dispose(): void {
-        if(this.ins.shadowEnabled.value) {
+        if(this.ins.shadowEnabled.value && this.light.shadow.map) {
             this.light.shadow.map.dispose();
         }
 

diff --git a/source/client/components/CVSpotLight.ts b/source/client/components/CVSpotLight.ts
@@ -53,7 +53,7 @@ export default class CVSpotLight extends CSpotLight implements ICVLight
     }
 
     dispose(): void {
-        if(this.ins.shadowEnabled.value) {
+        if(this.ins.shadowEnabled.value && this.light.shadow.map) {
             this.light.shadow.map.dispose();
         }