From d1e069ea23657ff08e8bed3f1f3453fb2921bda0 Mon Sep 17 00:00:00 2001 From: Hanif Bin Ariffin Date: Tue, 24 Sep 2019 16:45:34 -0400 Subject: [PATCH] Fixed incorrect use of variables The previous committer mistakenly used the wrong variable to query some values. This commit simply changes it so that it queries the right Dict. --- editor/import/editor_scene_importer_gltf.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/editor/import/editor_scene_importer_gltf.cpp b/editor/import/editor_scene_importer_gltf.cpp index 79658c5a4c9..f971fba2dfa 100644 --- a/editor/import/editor_scene_importer_gltf.cpp +++ b/editor/import/editor_scene_importer_gltf.cpp @@ -494,10 +494,10 @@ Error EditorSceneImporterGLTF::_parse_accessors(GLTFState &state) { const Dictionary &s = d["sparse"]; - ERR_FAIL_COND_V(!d.has("count"), ERR_PARSE_ERROR); - accessor.sparse_count = d["count"]; - ERR_FAIL_COND_V(!d.has("indices"), ERR_PARSE_ERROR); - const Dictionary &si = d["indices"]; + ERR_FAIL_COND_V(!s.has("count"), ERR_PARSE_ERROR); + accessor.sparse_count = s["count"]; + ERR_FAIL_COND_V(!s.has("indices"), ERR_PARSE_ERROR); + const Dictionary &si = s["indices"]; ERR_FAIL_COND_V(!si.has("bufferView"), ERR_PARSE_ERROR); accessor.sparse_indices_buffer_view = si["bufferView"]; @@ -508,8 +508,8 @@ Error EditorSceneImporterGLTF::_parse_accessors(GLTFState &state) { accessor.sparse_indices_byte_offset = si["byteOffset"]; } - ERR_FAIL_COND_V(!d.has("values"), ERR_PARSE_ERROR); - const Dictionary &sv = d["values"]; + ERR_FAIL_COND_V(!s.has("values"), ERR_PARSE_ERROR); + const Dictionary &sv = s["values"]; ERR_FAIL_COND_V(!sv.has("bufferView"), ERR_PARSE_ERROR); accessor.sparse_values_buffer_view = sv["bufferView"];