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

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

Browse Source 
# Conflicts:
#	Source/Engine/Navigation/NavMesh.cpp
#	Source/Engine/Navigation/NavMeshBuilder.cpp
This commit is contained in:
Wojtek Figat
2021-01-22 11:31:22 +01:00
parent cbbfb16628 8680aba897
commit 6cbeac6537
178 changed files with 1163 additions and 864 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Engine/Scripting/ManagedCLR/MAssembly.Mono.cpp
View File

@@ -302,7 +302,7 @@ bool MAssembly::LoadWithImage(const String& assemblyPath)
const auto assembly = mono_assembly_load_from_full(assemblyImage, name.Substring(0, name.Length() - 3).Get(), &status, false);
if (status != MONO_IMAGE_OK || assembly == nullptr)
{
// Close image if error occured
// Close image if error occurred
mono_image_close(assemblyImage);
Log::CLRInnerException(TEXT("Mono assembly image is corrupted at ") + assemblyPath);