Browse Source

Fix incorrect skin deduplication when using named binds

(cherry picked from commit 60f620411e337635ecbc4628e3df81f11ac25760)
Lyuma 4 năm trước cách đây
mục cha
commit
a0b8c24d92

+ 3 - 0
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)) {
 		if (skin_a->get_bind_bone(i) != skin_b->get_bind_bone(i)) {
 			return false;
 			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 a_xform = skin_a->get_bind_pose(i);
 		Transform b_xform = skin_b->get_bind_pose(i);
 		Transform b_xform = skin_b->get_bind_pose(i);