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

Merge remote-tracking branch 'origin/master' into 1.6

Browse Source
This commit is contained in:
Wojtek Figat
2023-05-08 12:58:42 +02:00
parent 95daff3e96 a5afa04f8f
commit 69cdb1268a
51 changed files with 7543 additions and 3604 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Engine/Platform/Base/ThreadBase.cpp
View File

@@ -7,7 +7,7 @@
#include "Engine/Scripting/ManagedCLR/MCore.h"
#if TRACY_ENABLE
#include "Engine/Core/Math/Math.h"
#include <ThirdParty/tracy/Tracy.h>
#include <ThirdParty/tracy/tracy/Tracy.hpp>
#endif
Delegate<Thread*> ThreadBase::ThreadStarting;