Merge pull request #16881 from fzwoch/gltf_embedded

gltf: improve embedded data discovery
2018-02-21 14:15:06 +01:00
parent b2412c72a0 1abf464b59
commit ff3e1eaeb3
1 changed files with 2 additions and 1 deletions
--- a/editor/import/editor_scene_importer_gltf.cpp
+++ b/editor/import/editor_scene_importer_gltf.cpp
@@ -1108,7 +1108,8 @@ Error EditorSceneImporterGLTF::_parse_images(GLTFState &state, const String &p_b
 		if (d.has("uri")) {
 			String uri = d["uri"];

-			if (uri.findn("data:application/octet-stream;base64") == 0) {
+			if (uri.findn("data:application/octet-stream;base64") == 0 ||
+					uri.findn("data:" + mimetype + ";base64") == 0) {
 				//embedded data
 				data = _parse_base64_uri(uri);
 				data_ptr = data.ptr();