Integrating up through commit 90f050496

2021-04-07 14:03:29 -07:00
parent 8f2ed080a9
commit c2cbd430fe
2694 changed files with 285622 additions and 176874 deletions
@@ -88,7 +88,7 @@ namespace Physics
        AZ::SerializeContext* serializeContext = azrtti_cast<AZ::SerializeContext*>(context);
        if (serializeContext)
        {
-            serializeContext->Class<CharacterConfiguration>()
+            serializeContext->Class<CharacterConfiguration, AzPhysics::SimulatedBodyConfiguration>()
                ->Version(2)
                ->Field("CollisionLayer", &CharacterConfiguration::m_collisionLayer)
                ->Field("CollisionGroupId", &CharacterConfiguration::m_collisionGroupId)