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

# Conflicts:
#	Content/Editor/DebugMaterials/DDGIDebugProbes.flax
#	Source/Editor/Windows/OutputLogWindow.cs
#	Source/Engine/Level/Actor.cpp
This commit is contained in:
Wojtek Figat
2025-09-24 18:18:27 +02:00
136 changed files with 1821 additions and 662 deletions

View File

@@ -371,6 +371,7 @@ namespace FlaxEditor.Windows.Assets
else
_viewport.SetInitialUIMode(_viewport._hasUILinked);
_viewport.UIModeToggled += OnUIModeToggled;
_viewport.CreateViewScalingOptions();
Graph.MainActor = _viewport.Instance;
Selection.Clear();
Select(Graph.Main);
@@ -567,6 +568,15 @@ namespace FlaxEditor.Windows.Assets
Graph.Dispose();
}
/// <inheritdoc />
protected override void OnClose()
{
// Save current UI view size state.
_viewport.SaveActiveUIScalingOption();
base.OnClose();
}
/// <inheritdoc />
public EditorViewport PresenterViewport => _viewport;