Merge branch 'master' into skinning

f474b919 · Mr.doob · 5aa43cd1 · eb3c0d59 · f474b919
隐藏空白更改
内联并排

Showing with 2 addition and 0 deletion

src/materials/Texture.js src/materials/Texture.js +2 -0

未找到文件。
--- a/src/materials/Texture.js
+++ b/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();