Merge branch '1.2' into IconOverhaul

2021-05-13 15:21:36 +02:00
parent d54efc73f1 2c51f79c0a
commit 887b52c18a
577 changed files with 26583 additions and 26529 deletions
--- a/Source/Editor/Content/Items/VisualScriptItem.cs
+++ b/Source/Editor/Content/Items/VisualScriptItem.cs
@@ -75,6 +75,7 @@ namespace FlaxEditor.Content
            }
        }

+        /// <inheritdoc />
        public int MetadataToken => 0;

        /// <inheritdoc />