Browse Source

Updated builds.

Mr.doob 4 years ago
parent
commit
b0b9aed67a
3 changed files with 30 additions and 5 deletions
  1. 13 3
      build/three.js
  2. 0 0
      build/three.min.js
  3. 17 2
      build/three.module.js

+ 13 - 3
build/three.js

@@ -29849,10 +29849,20 @@
 
 
 			if (json.animations) {
 			if (json.animations) {
 				object.animations = this.parseAnimations(json.animations);
 				object.animations = this.parseAnimations(json.animations);
-			}
+			} //
 
 
-			if (json.images === undefined || json.images.length === 0) {
-				if (onLoad !== undefined) onLoad(object);
+
+			if (onLoad !== undefined) {
+				var hasImages = false;
+
+				for (var uuid in images) {
+					if (images[uuid] instanceof HTMLImageElement) {
+						hasImages = true;
+						break;
+					}
+				}
+
+				if (hasImages === false) onLoad(object);
 			}
 			}
 
 
 			return object;
 			return object;

File diff suppressed because it is too large
+ 0 - 0
build/three.min.js


+ 17 - 2
build/three.module.js

@@ -40926,9 +40926,24 @@ class ObjectLoader extends Loader {
 
 
 		}
 		}
 
 
-		if ( json.images === undefined || json.images.length === 0 ) {
+		//
 
 
-			if ( onLoad !== undefined ) onLoad( object );
+		if ( onLoad !== undefined ) {
+
+			let hasImages = false;
+
+			for ( const uuid in images ) {
+
+				if ( images[ uuid ] instanceof HTMLImageElement ) {
+
+					hasImages = true;
+					break;
+
+				}
+
+			}
+
+			if ( hasImages === false ) onLoad( object );
 
 
 		}
 		}
 
 

Some files were not shown because too many files changed in this diff