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

Merge branch 'FlaxEngine:master' into late_join_fix

Browse Source
This commit is contained in:
VitaminCpp
2025-11-27 10:33:53 +01:00
committed by GitHub
parent 0007185b5f a1999183f2
commit 90472a4b31
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Engine/Platform/Unix/UnixFileSystem.cpp
View File

@@ -367,7 +367,7 @@ bool UnixFileSystem::getFilesFromDirectoryTop(Array<String>& results, const char
if (S_ISREG(statEntry.st_mode) != 0)
{
// Validate with filter
if (FileSystem::PathFilterHelper(fullPath, searchPattern))
if (FileSystemBase::PathFilterHelper(fullPath, searchPattern))
results.Add(String(fullPath));
}
}

1
Source/Engine/Scripting/Internal/InternalCalls.h
View File

@@ -138,6 +138,7 @@ DLLIMPORT extern "C" MonoDomain* mono_domain_get(void);
#else
#define MONO_THREAD_INFO_TYPE void
#define MONO_ENTER_GC_SAFE
#define MONO_EXIT_GC_SAFE
#define MONO_ENTER_GC_SAFE_WITH_INFO(info)