Skip to content

Commit 8ad5ed7

Browse files
committed
ObjectLoader: Ensure onLoad() is fired for DataTextures.
1 parent fa7b498 commit 8ad5ed7

File tree

1 file changed

+19
-2
lines changed

1 file changed

+19
-2
lines changed

src/loaders/ObjectLoader.js

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,9 +138,26 @@ class ObjectLoader extends Loader {
138138

139139
}
140140

141-
if ( json.images === undefined || json.images.length === 0 ) {
141+
//
142142

143-
if ( onLoad !== undefined ) onLoad( object );
143+
let hasImages = false;
144+
145+
for ( const uuid in images ) {
146+
147+
if ( images[ uuid ] instanceof HTMLImageElement ) {
148+
149+
hasImages = true;
150+
break;
151+
152+
}
153+
154+
}
155+
156+
// only fire onLoad() if no HTMLImageElements were loaded
157+
158+
if ( hasImages === false && onLoad !== undefined ) {
159+
160+
onLoad( object );
144161

145162
}
146163

0 commit comments

Comments
 (0)