diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-05-11 08:13:28 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-11 08:13:28 +0200 |
| commit | b38905ae981e25689b82030afd344f4ea69531b4 (patch) | |
| tree | 4725e1f898af832f562b663b8641fdbc3ccfcbdd | |
| parent | 1ec2fa42f83ec107d346e610496a547bde861725 (diff) | |
| parent | 9a50a4442da3fa9fcdb798f017b396ce73dadf32 (diff) | |
Merge pull request #18775 from yaakuro/master-gltf-image-fix
Use mimeType according to glTF spec.
| -rw-r--r-- | editor/import/editor_scene_importer_gltf.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/editor/import/editor_scene_importer_gltf.cpp b/editor/import/editor_scene_importer_gltf.cpp index af79f9946a..f4be6e8d59 100644 --- a/editor/import/editor_scene_importer_gltf.cpp +++ b/editor/import/editor_scene_importer_gltf.cpp @@ -1163,7 +1163,7 @@ Error EditorSceneImporterGLTF::_parse_images(GLTFState &state, const String &p_b continue; } - if (mimetype.findn("jpg") != -1) { + if (mimetype.findn("jpeg") != -1) { //is a jpg Ref<Image> img = Image::_jpg_mem_loader_func(data_ptr, data_size); |