summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLyuma <xn.lyuma@gmail.com>2021-05-20 20:26:11 -0700
committerLyuma <xn.lyuma@gmail.com>2021-05-20 20:26:11 -0700
commit60f620411e337635ecbc4628e3df81f11ac25760 (patch)
tree2eb19b052768490f9b9931cfd0f39f80f2f61f92
parentd5f9f58b61c2430ee5fae59a0366581482a3b636 (diff)
Fix incorrect skin deduplication when using named binds
-rw-r--r--modules/gltf/gltf_document.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/modules/gltf/gltf_document.cpp b/modules/gltf/gltf_document.cpp
index 7b0392fbc1..6b640fdb42 100644
--- a/modules/gltf/gltf_document.cpp
+++ b/modules/gltf/gltf_document.cpp
@@ -4390,6 +4390,9 @@ bool GLTFDocument::_skins_are_same(const Ref<Skin> skin_a, const Ref<Skin> skin_
if (skin_a->get_bind_bone(i) != skin_b->get_bind_bone(i)) {
return false;
}
+ if (skin_a->get_bind_name(i) != skin_b->get_bind_name(i)) {
+ return false;
+ }
Transform a_xform = skin_a->get_bind_pose(i);
Transform b_xform = skin_b->get_bind_pose(i);