Browse Source

Merge pull request #17262 from Mugen87/dev33

Core: Clean up redefinitions.
Michael Herzog 6 years ago
parent
commit
a80573aefa

+ 1 - 1
src/renderers/webgl/WebGLIndexedBufferRenderer.js

@@ -39,7 +39,7 @@ function WebGLIndexedBufferRenderer( gl, extensions, info, capabilities ) {
 
 		} else {
 
-			var extension = extensions.get( 'ANGLE_instanced_arrays' );
+			extension = extensions.get( 'ANGLE_instanced_arrays' );
 
 			if ( extension === null ) {
 

+ 3 - 3
src/renderers/webgl/WebGLTextures.js

@@ -410,9 +410,9 @@ function WebGLTextures( _gl, extensions, state, properties, capabilities, utils,
 							for ( var j = 0; j < mipmaps.length; ++ j ) {
 
 								var mipmap = mipmaps[ j ];
-								var image = mipmap.image[ i ].image;
+								var mipmapImage = mipmap.image[ i ].image;
 
-								state.texImage2D( _gl.TEXTURE_CUBE_MAP_POSITIVE_X + i, j + 1, glInternalFormat, image.width, image.height, 0, glFormat, glType, image.data );
+								state.texImage2D( _gl.TEXTURE_CUBE_MAP_POSITIVE_X + i, j + 1, glInternalFormat, mipmapImage.width, mipmapImage.height, 0, glFormat, glType, mipmapImage.data );
 
 							}
 
@@ -432,7 +432,7 @@ function WebGLTextures( _gl, extensions, state, properties, capabilities, utils,
 
 					} else {
 
-						var mipmaps = cubeImage[ i ].mipmaps;
+						mipmaps = cubeImage[ i ].mipmaps;
 
 						for ( var j = 0, jl = mipmaps.length; j < jl; j ++ ) {