From 60f620411e337635ecbc4628e3df81f11ac25760 Mon Sep 17 00:00:00 2001 From: Lyuma Date: Thu, 20 May 2021 20:26:11 -0700 Subject: [PATCH] Fix incorrect skin deduplication when using named binds --- modules/gltf/gltf_document.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/gltf/gltf_document.cpp b/modules/gltf/gltf_document.cpp index 7b0392fbc1d0..6b640fdb4252 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_a, const Ref 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);