diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-02-21 14:15:06 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-21 14:15:06 +0100 |
| commit | ff3e1eaeb3268e1f9721ced987ad77176f55d102 (patch) | |
| tree | 95c566bbb87d3a8f7a6fd612d0824f69b3977fe4 /editor | |
| parent | b2412c72a01d2454408d77c79a598f67ba4a5783 (diff) | |
| parent | 1abf464b59f66811f21e8ca02114327295841ada (diff) | |
Merge pull request #16881 from fzwoch/gltf_embedded
gltf: improve embedded data discovery
Diffstat (limited to 'editor')
| -rw-r--r-- | editor/import/editor_scene_importer_gltf.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/editor/import/editor_scene_importer_gltf.cpp b/editor/import/editor_scene_importer_gltf.cpp index 1c4617c353..2636839764 100644 --- 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(); |