浏览代码

Merge pull request #18820 from nipmarsh/csm_dispose_crash

CSM: Fix dispose() crash
Mr.doob 5 年之前
父节点
当前提交
dd60405c13
共有 1 个文件被更改,包括 7 次插入3 次删除
  1. 7 3
      examples/jsm/csm/CSM.js

+ 7 - 3
examples/jsm/csm/CSM.js

@@ -361,9 +361,13 @@ export class CSM {
 			delete material.defines.CSM_CASCADES;
 			delete material.defines.CSM_FADE;
 
-			delete shader.uniforms.CSM_cascades;
-			delete shader.uniforms.cameraNear;
-			delete shader.uniforms.shadowFar;
+			if ( shader !== null ) {
+
+				delete shader.uniforms.CSM_cascades;
+				delete shader.uniforms.cameraNear;
+				delete shader.uniforms.shadowFar;
+
+			}
 
 			material.needsUpdate = true;