summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <rverschelde@gmail.com>2019-07-29 09:56:25 +0200
committerGitHub <noreply@github.com>2019-07-29 09:56:25 +0200
commit5ad1abed47141218a3b3b5521f52f237bd962ebb (patch)
tree0e9209bbb6785057cbd398061c775799656aeb06
parent698d87bdeb2f51a7a5c0d96e48f8c8370a14c139 (diff)
parentc2e91005ef7abcbc4b0d4339a398572467b082ee (diff)
Merge pull request #30877 from JosephCatrambone/master
Bugfix GLTF import: Do not reindex when blend shapes are present.
-rw-r--r--editor/import/editor_scene_importer_gltf.cpp2
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 8246e74814..c9c5b3818f 100644
--- a/editor/import/editor_scene_importer_gltf.cpp
+++ b/editor/import/editor_scene_importer_gltf.cpp
@@ -986,7 +986,7 @@ Error EditorSceneImporterGLTF::_parse_meshes(GLTFState &state) {
Ref<SurfaceTool> st;
st.instance();
st->create_from_triangle_arrays(array);
- if (p.has("targets")) {
+ if (!p.has("targets")) {
//morph targets should not be reindexed, as array size might differ
//removing indices is the best bet here
st->deindex();