Merging latest origin

2021-05-07 16:28:11 -07:00
parent 80f6dcd258 4c453bf4b6
commit 1df2fe1d48
141 changed files with 2843 additions and 1178 deletions
@@ -151,7 +151,7 @@ namespace AZ
                SerializeContext* serializeContext = azrtti_cast<SerializeContext*>(context);
                if (serializeContext)
                {
-                    serializeContext->Class<AssImpAnimationImporter, SceneCore::LoadingComponent>()->Version(2); // [LYN-2281] Skinned mesh loading fixes
+                    serializeContext->Class<AssImpAnimationImporter, SceneCore::LoadingComponent>()->Version(3); // [LYN-3349] Rolling back rotation change
                }
            }