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

Minor tweak for #2003

Browse Source
This commit is contained in:
Wojtek Figat
2023-12-16 12:49:39 +01:00
parent c3dd05211b
commit efebb29ac0
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Editor/Content/Proxy/SceneProxy.cs
View File

@@ -73,7 +73,11 @@ namespace FlaxEditor.Content
/// <inheritdoc />
public override void OnContentWindowContextMenu(ContextMenu menu, ContentItem item)
{
menu.AddButton("Open additionally", () => { Editor.Instance.Scene.OpenScene(((SceneItem)item).ID, true); });
var id = ((SceneItem)item).ID;
if (Level.FindScene(id) == null)
{
menu.AddButton("Open (additive)", () => { Editor.Instance.Scene.OpenScene(id, true); });
}
}
}
}

2
Source/Editor/Windows/SceneTreeWindow.ContextMenu.cs
View File

@@ -158,7 +158,7 @@ namespace FlaxEditor.Windows
if (unloadedScenes.Count > 0)
{
contextMenu.AddSeparator();
var childCM = contextMenu.GetOrAddChildMenu("Add Scene");
var childCM = contextMenu.GetOrAddChildMenu("Open Scene");
foreach (var sceneGuid in unloadedScenes)
{
if (FlaxEngine.Content.GetAssetInfo(sceneGuid, out var unloadedScene))

2
Source/Engine/Level/Level.cpp
View File

@@ -439,7 +439,7 @@ public:
bool Do() const override
{
auto scene = Scripting::FindObject<Scene>(TargetScene);
auto scene = Level::FindScene(TargetScene);
if (!scene)
return true;
return unloadScene(scene);