浏览代码

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 a81f4dd5a7a92c2e7c7fc3185eeea745bd41cb5b)
K. S. Ernest (iFire) Lee 4 年之前
父节点
当前提交
d5b6cb4639
共有 1 个文件被更改,包括 5 次插入2 次删除
  1. 5 2
      editor/import/editor_scene_importer_gltf.cpp

+ 5 - 2
editor/import/editor_scene_importer_gltf.cpp

@@ -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();