godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #48904 from fire/gltf-img-failure 

When one invalid image fails, it should only fail that single image.
This commit is contained in:
Rémi Verschelde 2021-05-21 00:32:48 +02:00 committed by GitHub
parent bfe4af91a2 a81f4dd5a7
commit 37a417e838
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
modules/gltf/gltf_document.cpp
View File

@ -3031,8 +3031,11 @@ Error GLTFDocument::_parse_images(Ref<GLTFState> state, const String &p_base_pat
}
}
ERR_FAIL_COND_V_MSG(img.is_null(), ERR_FILE_CORRUPT,
vformat("glTF: Couldn't load image index '%d' with its given mimetype: %s.", i, mimetype));
if (img.is_null()) {
ERR_PRINT(vformat("glTF: Couldn't load image index '%d' with its given mimetype: %s.", i, mimetype));
state->images.push_back(Ref<Texture2D>());
continue;
}
Ref<ImageTexture> t;
t.instance();