diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-05-21 11:19:11 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-21 11:19:11 +0200 |
| commit | 82f688ce9b5d71d3032ef5e5cf8e4f4efe543e7e (patch) | |
| tree | 5fbb833f87c26e56b36dd4c4b9150ab6a65fcb00 /modules | |
| parent | 6c2420bc38eb48fd69cf6a7abb9bf7c9899eec36 (diff) | |
| parent | 60f620411e337635ecbc4628e3df81f11ac25760 (diff) | |
Merge pull request #48913 from lyuma/gltf_named_binds_dedup
Fix incorrect skin deduplication when using named binds
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/gltf/gltf_document.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/modules/gltf/gltf_document.cpp b/modules/gltf/gltf_document.cpp index 798034837a..b3fa17bfb5 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); |