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

When one invalid image fails, it should only fail that single image. 

Move to a more graceful degradation 3d asset import model.

(cherry picked from commit a81f4dd5a7)
This commit is contained in:
K. S. Ernest (iFire) Lee 2021-05-20 14:08:59 -07:00 committed by Rémi Verschelde
parent 2c400a7aae
commit d5b6cb4639
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
editor/import/editor_scene_importer_gltf.cpp
View File

@ -1451,8 +1451,11 @@ Error EditorSceneImporterGLTF::_parse_images(GLTFState &state, const String &p_b
}
}
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<Texture>());
continue;
}
Ref<ImageTexture> t;
t.instance();