GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source 
# Conflicts:
#	Source/Engine/Physics/Physics.Queries.cpp
#	Source/Engine/Physics/Utilities.h
This commit is contained in:
Wojtek Figat
2022-01-20 23:29:59 +01:00
parent a400568b51 f4f9d92c8e
commit 37e11a4b1f
2574 changed files with 5082 additions and 3221 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Engine/Engine/Engine.cpp
View File

@@ -1,4 +1,4 @@
// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.
// Copyright (c) 2012-2022 Wojciech Figat. All rights reserved.
#include "Engine.h"
#include "Game.h"
@@ -133,7 +133,7 @@ int32 Engine::Main(const Char* cmdLine)
Platform::BeforeRun();
EngineImpl::InitMainWindow();
Application::BeforeRun();
#if !USE_EDITOR && (PLATFORM_WINDOWS || PLATFORM_LINUX)
#if !USE_EDITOR && (PLATFORM_WINDOWS || PLATFORM_LINUX || PLATFORM_MAC)
EngineImpl::RunInBackground = PlatformSettings::Get()->RunInBackground;
#endif
Log::Logger::WriteFloor();