summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorK. S. Ernest (iFire) Lee <ernest.lee@chibifire.com>2021-05-20 14:08:59 -0700
committerK. S. Ernest (iFire) Lee <ernest.lee@chibifire.com>2021-05-20 14:30:19 -0700
commita81f4dd5a7a92c2e7c7fc3185eeea745bd41cb5b (patch)
tree828be6d37c1560074b39b7462013020659978c4a
parent98071ec136bad8ede5f8c0505e6cff6f33f787ef (diff)
When one invalid image fails, it should only fail that single image.
Move to a more graceful degradation 3d asset import model.
-rw-r--r--modules/gltf/gltf_document.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/modules/gltf/gltf_document.cpp b/modules/gltf/gltf_document.cpp
index e67e29f7b4..2d198b15f8 100644
--- a/modules/gltf/gltf_document.cpp
+++ b/modules/gltf/gltf_document.cpp
@@ -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();