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

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

Browse Source
This commit is contained in:
Wojtek Figat
2023-10-01 13:17:41 +02:00
parent a001a5fbdc 6d92d0b58f
commit dd21020297
58 changed files with 786 additions and 388 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Engine/Scripting/Scripting.cpp
View File

@@ -104,7 +104,7 @@ namespace
MMethod* _method_LateFixedUpdate = nullptr;
MMethod* _method_Draw = nullptr;
MMethod* _method_Exit = nullptr;
Array<BinaryModule*, InlinedAllocation<64>> _nonNativeModules;
Dictionary<StringAnsi, BinaryModule*, InlinedAllocation<64>> _nonNativeModules;
#if USE_EDITOR
bool LastBinariesLoadTriggeredCompilation = false;
#endif
@@ -329,6 +329,8 @@ bool Scripting::LoadBinaryModules(const String& path, const String& projectFolde
// Check if that module has been already registered
BinaryModule* module = BinaryModule::GetModule(nameAnsi);
if (!module)
_nonNativeModules.TryGet(nameAnsi, module);
if (!module)
{
// C++
@@ -398,7 +400,7 @@ bool Scripting::LoadBinaryModules(const String& path, const String& projectFolde
{
// Create module if native library is not used
module = New<ManagedBinaryModule>(nameAnsi);
_nonNativeModules.Add(module);
_nonNativeModules.Add(nameAnsi, module);
}
}