diff --git a/Source/Editor/Windows/Assets/SceneAnimationWindow.cs b/Source/Editor/Windows/Assets/SceneAnimationWindow.cs index 9b0875752..20219a079 100644 --- a/Source/Editor/Windows/Assets/SceneAnimationWindow.cs +++ b/Source/Editor/Windows/Assets/SceneAnimationWindow.cs @@ -97,6 +97,9 @@ namespace FlaxEditor.Windows.Assets [EditorDisplay(null, "1920x1080 (Full HD)")] _1920x1080, + [EditorDisplay(null, "2560x1440 (2K)")] + _2560x1440, + [EditorDisplay(null, "3840x2160 (4K)")] _3840x2160, @@ -173,6 +176,7 @@ namespace FlaxEditor.Windows.Assets case ResolutionModes._640x480: return new Int2(640, 480); case ResolutionModes._1280x720: return new Int2(1280, 720); case ResolutionModes._1920x1080: return new Int2(1920, 1080); + case ResolutionModes._2560x1440: return new Int2(2560, 1440); case ResolutionModes._3840x2160: return new Int2(3840, 2160); case ResolutionModes._7680x4320: return new Int2(7680, 4320); case ResolutionModes.Custom: return new Int2(Width, Height); @@ -456,8 +460,12 @@ namespace FlaxEditor.Windows.Assets _window.Editor.StateMachine.CurrentState.UpdateFPS(); for (int i = 0; i < _stagingTextures.Length; i++) { - _stagingTextures[i].Texture.ReleaseGPU(); - Object.Destroy(ref _stagingTextures[i].Texture); + var texture = _stagingTextures[i].Texture; + if (texture) + { + texture.ReleaseGPU(); + Object.Destroy(ref texture); + } } if (_progress != null) { diff --git a/Source/Editor/Windows/GameWindow.cs b/Source/Editor/Windows/GameWindow.cs index 34a97286c..56e4c4380 100644 --- a/Source/Editor/Windows/GameWindow.cs +++ b/Source/Editor/Windows/GameWindow.cs @@ -553,14 +553,14 @@ namespace FlaxEditor.Windows }); _defaultViewportScaling.Add(new ViewportScaleOptions { - Label = "1920x1080 Resolution", + Label = "1920x1080 Resolution (Full HD)", ScaleType = ViewportScaleType.Resolution, Size = new Int2(1920, 1080), Active = false, }); _defaultViewportScaling.Add(new ViewportScaleOptions { - Label = "2560x1440 Resolution", + Label = "2560x1440 Resolution (2K)", ScaleType = ViewportScaleType.Resolution, Size = new Int2(2560, 1440), Active = false,