Flax/FlaxEngine
3
0
Fork 0
Code Issues Pull Requests Releases Activity

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

Browse Source 
# Conflicts:
#	Source/Engine/GraphicsDevice/Vulkan/GPUSwapChainVulkan.cpp
#	Source/Engine/Renderer/Utils/GlobalSignDistanceFieldPass.cpp
#	Source/Engine/Scripting/Internal/InternalCalls.h
#	Source/Engine/Scripting/Internal/ManagedDictionary.cpp
#	Source/Engine/Scripting/Internal/ManagedDictionary.h
#	Source/Engine/Scripting/ScriptingObject.cpp
#	Source/Tools/Flax.Build/Bindings/BindingsGenerator.CSharp.cs
This commit is contained in:
mafiesto4
2026-09-16 12:38:27 +02:00
parent 740a04b9db 7a6190944c
commit d8a7382c8d
136 changed files with 1658 additions and 518 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Engine/Scripting/ManagedCLR/MUtils.cpp
+3
View File
@@ -3,6 +3,8 @@
#include "MUtils.h"
#include "MClass.h"
#include "MCore.h"
#include "MMethod.h"
#include "MAssembly.h"
#include "Engine/Core/Log.h"
#include "Engine/Core/Types/DataContainer.h"
#include "Engine/Core/Types/Version.h"
@@ -19,6 +21,7 @@
#include "Engine/Core/Math/Ray.h"
#include "Engine/Scripting/Scripting.h"
#include "Engine/Scripting/ScriptingObject.h"
#include "Engine/Scripting/BinaryModule.h"
#include "Engine/Scripting/Internal/StdTypesContainer.h"
#include "Engine/Scripting/Internal/ManagedDictionary.h"
#include "Engine/Utilities/StringConverter.h"