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
@@ -63,9 +63,10 @@ namespace EditorInternal
        AZStd::string GetCurrentLevelName() const override;
        AZStd::string GetCurrentLevelPath() const override;

+        const char* GetOldCryLevelExtension() const override;
+        const char* GetLevelExtension() const override;
+
    private:
-        static constexpr char DefaultFileExtension[] = ".ly";
-        static constexpr char OldFileExtension[] = ".cry";
        static constexpr char DefaultLevelFolder[] = "Levels";

        bool m_StartupAborted = false;