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

Source/Engine/Scripting/Attributes/CollectionAttribute.cs

@@ -10,6 +10,32 @@ namespace FlaxEngine
     [AttributeUsage(AttributeTargets.Field | AttributeTargets.Property | AttributeTargets.Class)]
     public sealed class CollectionAttribute : Attribute
     {
+        /// <summary>
+        /// The display type for collections.
+        /// </summary>
+        public enum DisplayType
+        {
+            /// <summary>
+            /// Displays the default display type.
+            /// </summary>
+            Default,
+            
+            /// <summary>
+            /// Displays a header.
+            /// </summary>
+            Header,
+            
+            /// <summary>
+            /// Displays inline.
+            /// </summary>
+            Inline,
+        }
+
+        /// <summary>
+        /// Gets or sets the display type.
+        /// </summary>
+        public DisplayType Display;
+        
         /// <summary>
         /// Gets or sets whether this collection is read-only. If <c>true</c>, applications using this collection should not allow to add or remove items.
         /// </summary>