GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add extra index guard logic

Browse Source
This commit is contained in:
Chandler Cox
2025-06-28 10:46:11 -05:00
parent b9cfd054c1
commit 52b64540ab
2 changed files with 32 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
Source/Editor/Viewport/PrefabWindowViewport.cs
View File

@@ -508,10 +508,17 @@ namespace FlaxEditor.Viewport
{
if (int.TryParse(defaultData, out var index))
{
_defaultScaleActiveIndex = index;
if (index != -1)
var options = Editor.Instance.UI.DefaultViewportScaleOptions;
if (options.Count > index)
{
ChangeUIView(Editor.Instance.UI.DefaultViewportScaleOptions[index]);
_defaultScaleActiveIndex = index;
if (index != -1)
ChangeUIView(Editor.Instance.UI.DefaultViewportScaleOptions[index]);
}
// Assume option does not exist anymore so move to default.
else if (index != -1)
{
_defaultScaleActiveIndex = 0;
}
}
}
@@ -521,10 +528,18 @@ namespace FlaxEditor.Viewport
{
if (int.TryParse(data, out var index))
{
_customScaleActiveIndex = index;
if (index != -1)
var options = Editor.Instance.UI.CustomViewportScaleOptions;
if (options.Count > index)
{
ChangeUIView(Editor.Instance.UI.CustomViewportScaleOptions[index]);
_customScaleActiveIndex = index;
if (index != -1)
ChangeUIView(options[index]);
}
// Assume option does not exist anymore so move to default.
else if (index != -1)
{
_defaultScaleActiveIndex = 0;
_customScaleActiveIndex = -1;
}
}
}

13
Source/Editor/Windows/GameWindow.cs
View File

@@ -1199,13 +1199,22 @@ namespace FlaxEditor.Windows
if (_defaultScaleActiveIndex != -1)
{
var options = Editor.UI.DefaultViewportScaleOptions;
ChangeViewportRatio(options[_defaultScaleActiveIndex]);
if (options.Count > _defaultScaleActiveIndex)
ChangeViewportRatio(options[_defaultScaleActiveIndex]);
else
_defaultScaleActiveIndex = 0;
}
if (_customScaleActiveIndex != -1)
{
var options = Editor.UI.CustomViewportScaleOptions;
ChangeViewportRatio(options[_customScaleActiveIndex]);
if (options.Count > _customScaleActiveIndex)
ChangeViewportRatio(options[_customScaleActiveIndex]);
else
{
_defaultScaleActiveIndex = 0;
_customScaleActiveIndex = -1;
}
}
}