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:
@@ -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;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user