Merge remote-tracking branch 'origin/gi' into large-worlds

# Conflicts: # Source/Engine/Core/Math/Vector3.h
2022-05-21 19:45:13 +02:00
parent f53a5ff536 1a64df9116
commit 785f8915b7
280 changed files with 7660 additions and 2355 deletions
--- a/Source/Editor/Windows/Assets/ParticleEmitterWindow.cs
+++ b/Source/Editor/Windows/Assets/ParticleEmitterWindow.cs
@@ -262,6 +262,9 @@ namespace FlaxEditor.Windows.Assets
            base.OnSurfaceEditingStart();
        }

+        /// <inheritdoc />
+        protected override bool CanEditSurfaceOnAssetLoadError => true;
+
        /// <inheritdoc />
        protected override bool SaveToOriginal()
        {