birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Integrating up through commit 90f050496

Browse Source
This commit is contained in:
alexpete
2021-04-07 14:03:29 -07:00
parent 8f2ed080a9
commit c2cbd430fe
2694 changed files with 285622 additions and 176874 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Sandbox/Editor/CryEditPy.cpp
+6 -6
View File
@@ -33,9 +33,6 @@
#include "UndoConfigSpec.h"
#include "ViewManager.h"
const char* GetCryEditDefaultFileExtension();
const char* GetCryEditOldFileExtension();
//////////////////////////////////////////////////////////////////////////
namespace
{
@@ -111,6 +108,9 @@ namespace
bool PyOpenLevel(const char* pLevelName)
{
const char* oldExtension = EditorUtils::LevelFile::GetOldCryFileExtension();
const char* defaultExtension = EditorUtils::LevelFile::GetDefaultFileExtension();
QString levelPath = pLevelName;
if (!QFile::exists(levelPath))
@@ -130,10 +130,10 @@ namespace
levelPath = levelsDir / levelPath / levelFileName;
// make sure the level path includes the cry extension, if needed
if (!levelFileName.endsWith(GetCryEditOldFileExtension()) && !levelFileName.endsWith(GetCryEditDefaultFileExtension()))
if (!levelFileName.endsWith(oldExtension) && !levelFileName.endsWith(defaultExtension))
{
QString newLevelPath = levelPath + GetCryEditDefaultFileExtension();
QString oldLevelPath = levelPath + GetCryEditOldFileExtension();
QString newLevelPath = levelPath + defaultExtension;
QString oldLevelPath = levelPath + oldExtension;
// Check if there is a .cry file, otherwise assume it is a new .ly file
if (QFileInfo(oldLevelPath).exists())