Browse Source

Merge branch 'master' into skinning

Mr.doob 14 years ago
parent
commit
f474b91918
1 changed files with 2 additions and 0 deletions
  1. 2 0
      src/materials/Texture.js

+ 2 - 0
src/materials/Texture.js

@@ -6,6 +6,8 @@
 
 THREE.Texture = function ( image, mapping, wrap_s, wrap_t, mag_filter, min_filter ) {
 
+	if ( image.getContext ) image.loaded = true;
+
 	this.image = image;
 
 	this.mapping = mapping !== undefined ? mapping : new THREE.UVMapping();