Merge branch 'master' into collection-ui

Source/Engine/Scripting/Attributes/Editor/VisibleIfAttribute.cs

@@ -5,11 +5,11 @@ using System;
 namespace FlaxEngine
 {
     /// <summary>
-    /// Shows property/field in the editor only if the specified member has a given value. Can be used to hide properties based on other properties (also private properties). The given member has to be bool type.
+    /// Shows property/field in the editor only if the specified member has a given value. Can be used to hide properties based on other properties (also private properties). The given member has to be bool type. Multiple VisibleIf attributes can be added for additional conditions to be met.
     /// </summary>
     /// <seealso cref="System.Attribute" />
     [Serializable]
-    [AttributeUsage(AttributeTargets.Field | AttributeTargets.Property)]
+    [AttributeUsage(AttributeTargets.Field | AttributeTargets.Property, AllowMultiple = true)]
     public sealed class VisibleIfAttribute : Attribute
     {
         /// <summary>

Source/Engine/Scripting/Attributes/PluginLoadOrder.cs

@@ -0,0 +1,21 @@
+using System;
+
+namespace FlaxEngine;
+
+/// <summary>
+/// This attribute allows for specifying initialization and deinitialization order for plugins.
+/// </summary>
+[Serializable]
+[AttributeUsage(AttributeTargets.Class)]
+public class PluginLoadOrderAttribute : Attribute
+{
+    /// <summary>
+    /// The plugin type to initialize this plugin after.
+    /// </summary>
+    public Type InitializeAfter;
+
+    /// <summary>
+    /// The plugin type to deinitialize this plugin before.
+    /// </summary>
+    public Type DeinitializeBefore;
+}