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
@@ -30,6 +30,7 @@ namespace AZ
            CameraModule()
            {
                m_descriptors.insert(m_descriptors.end(), {
+                    CameraControllerComponent::CreateDescriptor(),
                    ArcBallControllerComponent::CreateDescriptor(),
                    CameraComponent::CreateDescriptor(),
                    NoClipControllerComponent::CreateDescriptor(),
@@ -52,6 +52,8 @@ namespace AZ

        void NoClipControllerComponent::Reflect(AZ::ReflectContext* reflection)
        {
+            NoClipControllerProperties::Reflect(reflection);
+
            if (auto* serializeContext = azrtti_cast<AZ::SerializeContext*>(reflection))
            {
                serializeContext->Class<NoClipControllerComponent, CameraControllerComponent, AZ::Component>()