Home Explore Help
Sign In
javascript
/
three.js
mirror of https://github.com/tazdij/three.js.git
2
0
Fork 0
Files Issues 0 Wiki
Browse Source

Merge remote-tracking branch 'remotes/rectalogic/imagedata' into dev

alteredq 14 years ago
parent
674a7c0765 9b0536da91
commit
d5b117fc18
1 changed files with 1 additions and 1 deletions
Unified View Show Diff Stats
  1. 1 1
      src/renderers/WebGLRenderer.js

+ 1 - 1
src/renderers/WebGLRenderer.js
View File 

@@ -4891,7 +4891,7 @@ THREE.WebGLRenderer = function ( parameters ) {
 
 
 
 			_gl.bindTexture( _gl.TEXTURE_2D, texture.__webglTexture );
 
 			_gl.bindTexture( _gl.TEXTURE_2D, texture.__webglTexture );
 
 
 
-			if ( texture.image.data ) {
 
+			if ( texture instanceof THREE.DataTexture) {
 
 
 
 				_gl.texImage2D( _gl.TEXTURE_2D, 0, paramThreeToGL( texture.format ), texture.image.width, texture.image.height, 0, paramThreeToGL( texture.format ), _gl.UNSIGNED_BYTE, texture.image.data );
 
 				_gl.texImage2D( _gl.TEXTURE_2D, 0, paramThreeToGL( texture.format ), texture.image.width, texture.image.height, 0, paramThreeToGL( texture.format ), _gl.UNSIGNED_BYTE, texture.image.data );