Merge branch 'master' into update_copyrights

2021-02-28 12:18:41 +01:00
parent 9e8dbd0ca5 9336341eac
commit c669c8f1eb
438 changed files with 57029 additions and 221 deletions
--- a/code/AssetLib/glTF2/glTF2Exporter.cpp
+++ b/code/AssetLib/glTF2/glTF2Exporter.cpp
@@ -1388,6 +1388,7 @@ void glTF2Exporter::ExportAnimations()
            nameAnim = anim->mName.C_Str();
        }
        Ref<Animation> animRef = mAsset->animations.Create(nameAnim);
+        animRef->name = nameAnim;

        for (unsigned int channelIndex = 0; channelIndex < anim->mNumChannels; ++channelIndex) {
            const aiNodeAnim* nodeChannel = anim->mChannels[channelIndex];