Merge remote-tracking branch 'origin/master' into navigation-features

# Conflicts: # Source/Editor/Content/Settings/NavigationSettings.cs # Source/Engine/Engine/PhysicalMaterial.cs # Source/Tools/Flax.Build/Bindings/BindingsGenerator.Api.cs
2021-01-04 14:31:56 +01:00
parent b38ccb0fbd d715c0c0dd
commit cc8e78b505
2425 changed files with 4606 additions and 30937 deletions
--- a/Source/Engine/Scripting/Attributes/CollectionAttribute.cs
+++ b/Source/Engine/Scripting/Attributes/CollectionAttribute.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.

 using System;

--- a/Source/Engine/Scripting/Attributes/Editor/AssetReferenceAttribute.cs
+++ b/Source/Engine/Scripting/Attributes/Editor/AssetReferenceAttribute.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.

 using System;

--- a/Source/Engine/Scripting/Attributes/Editor/CustomEditorAliasAttribute.cs
+++ b/Source/Engine/Scripting/Attributes/Editor/CustomEditorAliasAttribute.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.

 using System;

--- a/Source/Engine/Scripting/Attributes/Editor/CustomEditorAttribute.cs
+++ b/Source/Engine/Scripting/Attributes/Editor/CustomEditorAttribute.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.

 using System;

--- a/Source/Engine/Scripting/Attributes/Editor/DefaultEditorAttribute.cs
+++ b/Source/Engine/Scripting/Attributes/Editor/DefaultEditorAttribute.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.

 using System;

--- a/Source/Engine/Scripting/Attributes/Editor/EditorDisplayAttribute.cs
+++ b/Source/Engine/Scripting/Attributes/Editor/EditorDisplayAttribute.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.

 using System;

--- a/Source/Engine/Scripting/Attributes/Editor/EditorOrderAttribute.cs
+++ b/Source/Engine/Scripting/Attributes/Editor/EditorOrderAttribute.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.

 using System;

--- a/Source/Engine/Scripting/Attributes/Editor/EnumDisplayAttribute.cs
+++ b/Source/Engine/Scripting/Attributes/Editor/EnumDisplayAttribute.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.

 using System;

--- a/Source/Engine/Scripting/Attributes/Editor/ExpandGroupsAttribute.cs
+++ b/Source/Engine/Scripting/Attributes/Editor/ExpandGroupsAttribute.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.

 using System;

--- a/Source/Engine/Scripting/Attributes/Editor/HeaderAttribute.cs
+++ b/Source/Engine/Scripting/Attributes/Editor/HeaderAttribute.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.

 using System;

--- a/Source/Engine/Scripting/Attributes/Editor/HideInEditorAttribute.cs
+++ b/Source/Engine/Scripting/Attributes/Editor/HideInEditorAttribute.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.

 using System;

--- a/Source/Engine/Scripting/Attributes/Editor/LimitAttribute.cs
+++ b/Source/Engine/Scripting/Attributes/Editor/LimitAttribute.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.

 using System;

--- a/Source/Engine/Scripting/Attributes/Editor/MultilineTextAttribute.cs
+++ b/Source/Engine/Scripting/Attributes/Editor/MultilineTextAttribute.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.

 using System;

--- a/Source/Engine/Scripting/Attributes/Editor/RangeAttribute.cs
+++ b/Source/Engine/Scripting/Attributes/Editor/RangeAttribute.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.

 using System;

--- a/Source/Engine/Scripting/Attributes/Editor/ReadOnlyAttribute.cs
+++ b/Source/Engine/Scripting/Attributes/Editor/ReadOnlyAttribute.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.

 using System;

--- a/Source/Engine/Scripting/Attributes/Editor/ShowInEditorAttribute.cs
+++ b/Source/Engine/Scripting/Attributes/Editor/ShowInEditorAttribute.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.

 using System;

--- a/Source/Engine/Scripting/Attributes/Editor/SpaceAttribute.cs
+++ b/Source/Engine/Scripting/Attributes/Editor/SpaceAttribute.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.

 using System;

--- a/Source/Engine/Scripting/Attributes/Editor/TooltipAttribute.cs
+++ b/Source/Engine/Scripting/Attributes/Editor/TooltipAttribute.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.

 using System;

--- a/Source/Engine/Scripting/Attributes/Editor/TypeReferenceAttribute.cs
+++ b/Source/Engine/Scripting/Attributes/Editor/TypeReferenceAttribute.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.

 using System;

--- a/Source/Engine/Scripting/Attributes/Editor/VisibleIfAttribute.cs
+++ b/Source/Engine/Scripting/Attributes/Editor/VisibleIfAttribute.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.

 using System;

--- a/Source/Engine/Scripting/Attributes/ExecuteInEditModeAttribute.cs
+++ b/Source/Engine/Scripting/Attributes/ExecuteInEditModeAttribute.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.

 using System;

--- a/Source/Engine/Scripting/Attributes/MonoPInvokeCallbackAttribute.cs
+++ b/Source/Engine/Scripting/Attributes/MonoPInvokeCallbackAttribute.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.

 using System;
 using System.Runtime.InteropServices;
--- a/Source/Engine/Scripting/Attributes/NoAnimateAttribute.cs
+++ b/Source/Engine/Scripting/Attributes/NoAnimateAttribute.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.

 using System;

--- a/Source/Engine/Scripting/Attributes/NoSerializeAttribute.cs
+++ b/Source/Engine/Scripting/Attributes/NoSerializeAttribute.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.

 using System;

--- a/Source/Engine/Scripting/Attributes/SerializeAttribute.cs
+++ b/Source/Engine/Scripting/Attributes/SerializeAttribute.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.

 using System;

--- a/Source/Engine/Scripting/Attributes/UnmanagedAttribute.cs
+++ b/Source/Engine/Scripting/Attributes/UnmanagedAttribute.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.

 using System;

--- a/Source/Engine/Scripting/BinaryModule.cpp
+++ b/Source/Engine/Scripting/BinaryModule.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.

 #include "BinaryModule.h"
 #include "ScriptingObject.h"
--- a/Source/Engine/Scripting/BinaryModule.h
+++ b/Source/Engine/Scripting/BinaryModule.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.

 #pragma once

--- a/Source/Engine/Scripting/InternalCalls.h
+++ b/Source/Engine/Scripting/InternalCalls.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.

 #pragma once

--- a/Source/Engine/Scripting/InternalCalls/EngineInternalCalls.cpp
+++ b/Source/Engine/Scripting/InternalCalls/EngineInternalCalls.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.

 #include "Engine/Platform/FileSystem.h"
 #include "Engine/Debug/DebugLog.h"
--- a/Source/Engine/Scripting/InternalCalls/ManagedBitArray.h
+++ b/Source/Engine/Scripting/InternalCalls/ManagedBitArray.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.

 #pragma once

--- a/Source/Engine/Scripting/InternalCalls/ManagedDictionary.h
+++ b/Source/Engine/Scripting/InternalCalls/ManagedDictionary.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.

 #pragma once

--- a/Source/Engine/Scripting/MException.cpp
+++ b/Source/Engine/Scripting/MException.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.

 #include "MException.h"
 #include "ManagedCLR/MUtils.h"
--- a/Source/Engine/Scripting/MException.h
+++ b/Source/Engine/Scripting/MException.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.

 #pragma once

--- a/Source/Engine/Scripting/MainThreadManagedInvokeAction.cpp
+++ b/Source/Engine/Scripting/MainThreadManagedInvokeAction.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.

 #include "MainThreadManagedInvokeAction.h"
 #include "Engine/Threading/Threading.h"
--- a/Source/Engine/Scripting/MainThreadManagedInvokeAction.h
+++ b/Source/Engine/Scripting/MainThreadManagedInvokeAction.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.

 #pragma once

--- a/Source/Engine/Scripting/ManagedCLR/MAssembly.Mono.cpp
+++ b/Source/Engine/Scripting/ManagedCLR/MAssembly.Mono.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.

 #include "MAssembly.h"

@@ -159,10 +159,16 @@ MClass* MAssembly::GetClass(const StringAnsiView& fullname) const
        return nullptr;
    }

+    StringAnsiView key(fullname);
+
+    // Special case for reference
+    if (fullname[fullname.Length() - 1] == '&')
+        key = StringAnsiView(key.Get(), key.Length() - 1);
+
    // Find class by name
    const auto& classes = GetClasses();
    MClass* result = nullptr;
-    classes.TryGet(fullname, result);
+    classes.TryGet(key, result);
 #if 0
    if (!result)
    {
--- a/Source/Engine/Scripting/ManagedCLR/MAssembly.h
+++ b/Source/Engine/Scripting/ManagedCLR/MAssembly.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.

 #pragma once

--- a/Source/Engine/Scripting/ManagedCLR/MAssemblyOptions.h
+++ b/Source/Engine/Scripting/ManagedCLR/MAssemblyOptions.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.

 #pragma once

--- a/Source/Engine/Scripting/ManagedCLR/MClass.Mono.cpp
+++ b/Source/Engine/Scripting/ManagedCLR/MClass.Mono.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.

 #include "MClass.h"

--- a/Source/Engine/Scripting/ManagedCLR/MClass.h
+++ b/Source/Engine/Scripting/ManagedCLR/MClass.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.

 #pragma once

--- a/Source/Engine/Scripting/ManagedCLR/MCore.Mono.cpp
+++ b/Source/Engine/Scripting/ManagedCLR/MCore.Mono.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.

 #include "MCore.h"

--- a/Source/Engine/Scripting/ManagedCLR/MCore.h
+++ b/Source/Engine/Scripting/ManagedCLR/MCore.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.

 #pragma once

--- a/Source/Engine/Scripting/ManagedCLR/MDomain.Mono.cpp
+++ b/Source/Engine/Scripting/ManagedCLR/MDomain.Mono.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.

 #include "MDomain.h"

--- a/Source/Engine/Scripting/ManagedCLR/MDomain.h
+++ b/Source/Engine/Scripting/ManagedCLR/MDomain.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.

 #pragma once

--- a/Source/Engine/Scripting/ManagedCLR/MEvent.Mono.cpp
+++ b/Source/Engine/Scripting/ManagedCLR/MEvent.Mono.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.

 #include "MEvent.h"

--- a/Source/Engine/Scripting/ManagedCLR/MEvent.h
+++ b/Source/Engine/Scripting/ManagedCLR/MEvent.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.

 #pragma once

--- a/Source/Engine/Scripting/ManagedCLR/MField.Mono.cpp
+++ b/Source/Engine/Scripting/ManagedCLR/MField.Mono.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.

 #include "MField.h"

--- a/Source/Engine/Scripting/ManagedCLR/MField.h
+++ b/Source/Engine/Scripting/ManagedCLR/MField.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.

 #pragma once

--- a/Source/Engine/Scripting/ManagedCLR/MMethod.Mono.cpp
+++ b/Source/Engine/Scripting/ManagedCLR/MMethod.Mono.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.

 #include "MMethod.h"

--- a/Source/Engine/Scripting/ManagedCLR/MMethod.h
+++ b/Source/Engine/Scripting/ManagedCLR/MMethod.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.

 #pragma once

--- a/Source/Engine/Scripting/ManagedCLR/MProperty.Mono.cpp
+++ b/Source/Engine/Scripting/ManagedCLR/MProperty.Mono.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.

 #include "MProperty.h"

--- a/Source/Engine/Scripting/ManagedCLR/MProperty.h
+++ b/Source/Engine/Scripting/ManagedCLR/MProperty.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.

 #pragma once

--- a/Source/Engine/Scripting/ManagedCLR/MStaticConverter.h
+++ b/Source/Engine/Scripting/ManagedCLR/MStaticConverter.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.

 #pragma once

--- a/Source/Engine/Scripting/ManagedCLR/MType.cpp
+++ b/Source/Engine/Scripting/ManagedCLR/MType.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.

 #include "MType.h"
 #include "MUtils.h"
--- a/Source/Engine/Scripting/ManagedCLR/MType.h
+++ b/Source/Engine/Scripting/ManagedCLR/MType.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.

 #pragma once

--- a/Source/Engine/Scripting/ManagedCLR/MTypes.h
+++ b/Source/Engine/Scripting/ManagedCLR/MTypes.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.

 #pragma once

--- a/Source/Engine/Scripting/ManagedCLR/MUtils.cpp
+++ b/Source/Engine/Scripting/ManagedCLR/MUtils.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.

 #include "MUtils.h"
 #include "MClass.h"
--- a/Source/Engine/Scripting/ManagedCLR/MUtils.h
+++ b/Source/Engine/Scripting/ManagedCLR/MUtils.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.

 #pragma once

--- a/Source/Engine/Scripting/ManagedSerialization.cpp
+++ b/Source/Engine/Scripting/ManagedSerialization.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.

 #include "ManagedSerialization.h"
 #include "Engine/Core/Log.h"
--- a/Source/Engine/Scripting/ManagedSerialization.h
+++ b/Source/Engine/Scripting/ManagedSerialization.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.

 #pragma once

--- a/Source/Engine/Scripting/Object.cs
+++ b/Source/Engine/Scripting/Object.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.

 using System;
 using System.Runtime.CompilerServices;
--- a/Source/Engine/Scripting/Plugins/GamePlugin.cs
+++ b/Source/Engine/Scripting/Plugins/GamePlugin.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.

 namespace FlaxEngine
 {
--- a/Source/Engine/Scripting/Plugins/Plugin.cs
+++ b/Source/Engine/Scripting/Plugins/Plugin.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.

 using System;

@@ -12,6 +12,8 @@ namespace FlaxEngine
    /// </remarks>
    public abstract class Plugin
    {
+        internal bool _initialized;
+
        /// <summary>
        /// Gets the description.
        /// </summary>
--- a/Source/Engine/Scripting/Plugins/PluginDescription.cs
+++ b/Source/Engine/Scripting/Plugins/PluginDescription.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.

 using System;

--- a/Source/Engine/Scripting/Plugins/PluginManager.cpp
+++ b/Source/Engine/Scripting/Plugins/PluginManager.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.

 #include "PluginManager.h"
 #include "FlaxEngine.Gen.h"
--- a/Source/Engine/Scripting/Plugins/PluginManager.cs
+++ b/Source/Engine/Scripting/Plugins/PluginManager.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.

 using System;
 using System.Collections.Generic;
@@ -77,8 +77,33 @@ namespace FlaxEngine
            //return !pluginDesc.DisabledByDefault;
        }

+        /// <summary>
+        /// Initialize all <see cref="GamePlugin"/>
+        /// </summary>
+        public static void InitializeGamePlugins()
+        {
+            for (var i = 0; i < _gamePlugins.Count; i++)
+            {
+                InvokeInitialize(_gamePlugins[i]);
+            }
+        }
+
+        /// <summary>
+        /// Deinitialize all <see cref="GamePlugin"/>
+        /// </summary>
+        public static void DeinitializeGamePlugins()
+        {
+            for (var i = _gamePlugins.Count - 1; i >= 0; i--)
+            {
+                InvokeDeinitialize(_gamePlugins[i]);
+            }
+        }
+
        private static void InvokeInitialize(Plugin plugin)
        {
+            if (plugin._initialized)
+                return;
+
            try
            {
                Debug.Write(LogType.Info, "Loading plugin " + plugin);
@@ -86,6 +111,7 @@ namespace FlaxEngine
                PluginLoading?.Invoke(plugin);

                plugin.Initialize();
+                plugin._initialized = true;

                PluginLoaded?.Invoke(plugin);
            }
@@ -98,6 +124,9 @@ namespace FlaxEngine

        private static void InvokeDeinitialize(Plugin plugin)
        {
+            if (!plugin._initialized)
+                return;
+
            try
            {
                Debug.Write(LogType.Info, "Unloading plugin " + plugin);
@@ -105,6 +134,7 @@ namespace FlaxEngine
                PluginUnloading?.Invoke(plugin);

                plugin.Deinitialize();
+                plugin._initialized = false;

                PluginUnloaded?.Invoke(plugin);
            }
@@ -173,14 +203,20 @@ namespace FlaxEngine
                return;
            }

-            // Init
-            InvokeInitialize(plugin);
-
-            // Register
-            if (isEditor)
-                _editorPlugins.Add(plugin);
-            else
+            if (!isEditor)
+            {
                _gamePlugins.Add((GamePlugin)plugin);
+#if !FLAX_EDITOR
+                InvokeInitialize(plugin);
+#endif
+            }
+#if FLAX_EDITOR
+            else
+            {
+                _editorPlugins.Add(plugin);
+                InvokeInitialize(plugin);
+            }
+#endif
        }

        internal static void Internal_Dispose(Assembly assembly)
--- a/Source/Engine/Scripting/Plugins/PluginManager.h
+++ b/Source/Engine/Scripting/Plugins/PluginManager.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.

 #pragma once

--- a/Source/Engine/Scripting/Script.cpp
+++ b/Source/Engine/Scripting/Script.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.

 #include "Script.h"
 #include "Engine/Core/Log.h"
--- a/Source/Engine/Scripting/Script.cs
+++ b/Source/Engine/Scripting/Script.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.

 namespace FlaxEngine
 {
--- a/Source/Engine/Scripting/Script.h
+++ b/Source/Engine/Scripting/Script.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.

 #pragma once

--- a/Source/Engine/Scripting/Scripting.Build.cs
+++ b/Source/Engine/Scripting/Scripting.Build.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.

 using Flax.Build;
 using Flax.Build.NativeCpp;
--- a/Source/Engine/Scripting/Scripting.Internal.cpp
+++ b/Source/Engine/Scripting/Scripting.Internal.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.

 #include "Scripting.h"
 #include "ScriptingType.h"
--- a/Source/Engine/Scripting/Scripting.cpp
+++ b/Source/Engine/Scripting/Scripting.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.

 #include "BinaryModule.h"
 #include "Scripting.h"
--- a/Source/Engine/Scripting/Scripting.cs
+++ b/Source/Engine/Scripting/Scripting.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.

 using System;
 using System.Collections;
--- a/Source/Engine/Scripting/Scripting.h
+++ b/Source/Engine/Scripting/Scripting.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.

 #pragma once

--- a/Source/Engine/Scripting/ScriptingCalls.h
+++ b/Source/Engine/Scripting/ScriptingCalls.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.

 #pragma once

--- a/Source/Engine/Scripting/ScriptingObject.cpp
+++ b/Source/Engine/Scripting/ScriptingObject.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.

 #include "ScriptingObject.h"
 #include "Scripting.h"
@@ -137,7 +137,7 @@ MonoObject* ScriptingObject::CreateManagedInternal()
    MClass* monoClass = GetClass();
    if (monoClass == nullptr)
    {
-        LOG(Warning, "Missing managed class for objecct '{0}'.", ToString());
+        LOG(Warning, "Missing managed class for object with id {0}", GetID());
        return nullptr;
    }

@@ -249,7 +249,7 @@ void ScriptingObject::OnDeleteObject()

 String ScriptingObject::ToString() const
 {
-    return GetClass()->ToString();
+    return _type ? _type.GetType().ManagedClass->ToString() : String::Empty;
 }

 ManagedScriptingObject::ManagedScriptingObject(const SpawnParams& params)
--- a/Source/Engine/Scripting/ScriptingObject.h
+++ b/Source/Engine/Scripting/ScriptingObject.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.

 #pragma once

--- a/Source/Engine/Scripting/ScriptingObjectReference.h
+++ b/Source/Engine/Scripting/ScriptingObjectReference.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.

 #pragma once

--- a/Source/Engine/Scripting/ScriptingType.h
+++ b/Source/Engine/Scripting/ScriptingType.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.

 #pragma once

--- a/Source/Engine/Scripting/StdTypesContainer.cpp
+++ b/Source/Engine/Scripting/StdTypesContainer.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.

 #include "StdTypesContainer.h"
 #include "Scripting.h"
--- a/Source/Engine/Scripting/StdTypesContainer.h
+++ b/Source/Engine/Scripting/StdTypesContainer.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.

 #pragma once

--- a/Source/Engine/Scripting/Types.h
+++ b/Source/Engine/Scripting/Types.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.

 #pragma once