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

# Conflicts:
#	Source/Engine/Content/Storage/FlaxStorage.cpp
#	Source/Engine/Renderer/GBufferPass.cpp
This commit is contained in:
Wojtek Figat
2024-05-15 23:49:05 +02:00
54 changed files with 902 additions and 360 deletions

View File

@@ -134,7 +134,7 @@ public:
static ScriptingObject* ToNative(MObject* obj);
static MObject* ToManaged(ScriptingObject* obj)
FORCE_INLINE static MObject* ToManaged(const ScriptingObject* obj)
{
return obj ? obj->GetOrCreateManagedInstance() : nullptr;
}