Explorar o código

Merge pull request #20043 from Mugen87/dev51

WebGLCubeMaps: Fix runtime error when image is undefined.
Mr.doob %!s(int64=5) %!d(string=hai) anos
pai
achega
4bb1b0104b
Modificáronse 1 ficheiros con 8 adicións e 6 borrados
  1. 8 6
      src/renderers/webgl/WebGLCubeMaps.js

+ 8 - 6
src/renderers/webgl/WebGLCubeMaps.js

@@ -1,9 +1,5 @@
-/**
- * @author mrdoob / http://mrdoob.com/
- */
-
 import { CubeReflectionMapping, CubeRefractionMapping, EquirectangularReflectionMapping, EquirectangularRefractionMapping } from '../../constants.js';
-import { WebGLCubeRenderTarget } from "../WebGLCubeRenderTarget.js";
+import { WebGLCubeRenderTarget } from '../WebGLCubeRenderTarget.js';
 
 function WebGLCubeMaps( renderer ) {
 
@@ -42,7 +38,7 @@ function WebGLCubeMaps( renderer ) {
 
 					const image = texture.image;
 
-					if ( image.height > 0 ) {
+					if ( image && image.height > 0 ) {
 
 						const renderTarget = new WebGLCubeRenderTarget( image.height / 2 );
 						renderTarget.fromEquirectangularTexture( renderer, texture );
@@ -50,6 +46,12 @@ function WebGLCubeMaps( renderer ) {
 
 						return mapTextureMapping( renderTarget.texture, texture.mapping );
 
+					} else {
+
+						// image not yet ready. try the conversion next frame
+
+						return null;
+
 					}
 
 				}