From a0b8c24d927c7d7cf99935776444558eac3f5ad8 Mon Sep 17 00:00:00 2001
From: Lyuma <xn.lyuma@gmail.com>
Date: Thu, 20 May 2021 20:26:11 -0700
Subject: [PATCH] Fix incorrect skin deduplication when using named binds

(cherry picked from commit 60f620411e337635ecbc4628e3df81f11ac25760)
---
 editor/import/editor_scene_importer_gltf.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/editor/import/editor_scene_importer_gltf.cpp b/editor/import/editor_scene_importer_gltf.cpp
index 2c0e5ab76d1..1398be5980d 100644
--- a/editor/import/editor_scene_importer_gltf.cpp
+++ b/editor/import/editor_scene_importer_gltf.cpp
@@ -2359,6 +2359,9 @@ bool EditorSceneImporterGLTF::_skins_are_same(const Ref<Skin> &skin_a, const Ref
 		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);