Merge pull request #48913 from lyuma/gltf_named_binds_dedup

Fix incorrect skin deduplication when using named binds
godotengine · May 21, 2021 · 82f688c · 82f688c
2 parents 6c2420b + 60f6204
commit 82f688c
Showing 1 changed file with 3 additions and 0 deletions.
diff --git 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);