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

Merge branch 'master' of https://github.com/FlaxEngine/FlaxEngine into dev

Browse Source
This commit is contained in:
thallard
2021-08-05 22:37:22 +02:00
parent d95cd24b76 25f48a3469
commit 9682ac4643
23 changed files with 329 additions and 291 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -167,7 +167,7 @@ namespace FlaxEditor.Windows
/// </summary>
/// <param name="parent">The parent control.</param>
/// <param name="location">The location (within a given control).</param>
private void ShowContextMenu(Control parent, ref Vector2 location)
private void ShowContextMenu(Control parent, Vector2 location)
{
var contextMenu = CreateContextMenu();

4
Source/Editor/Windows/SceneTreeWindow.cs
View File

@@ -276,7 +276,7 @@ namespace FlaxEditor.Windows
if (!Editor.StateMachine.CurrentState.CanEditScene)
return;
ShowContextMenu(node, ref location);
ShowContextMenu(node, location);
}
/// <inheritdoc />
@@ -379,7 +379,7 @@ namespace FlaxEditor.Windows
{
// Show context menu
Editor.SceneEditing.Deselect();
ShowContextMenu(this, ref location);
ShowContextMenu(Parent, location + _searchBox.BottomLeft);
}
return true;