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
@@ -52,6 +52,7 @@ namespace Camera
        float m_frustumHeight = DefaultFrustumDimension;
        bool m_specifyFrustumDimensions = false;
        AZ::u64 m_editorEntityId = AZ::EntityId::InvalidEntityId;
+        bool m_makeActiveViewOnActivation = true;
    };

    class CameraComponentController