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

Merge remote-tracking branch 'origin/master' into linux-editor

Browse Source 
# Conflicts:
#	Source/Engine/Core/Math/Color.cs
#	Source/Engine/Navigation/Navigation.cpp
#	Source/Engine/Platform/Win32/Win32Platform.cpp
This commit is contained in:
Wojtek Figat
2021-02-23 22:29:07 +01:00
parent 747a9bcb98 87a290b45c
commit cf3ac7a26e
147 changed files with 1740 additions and 1311 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Editor/SceneGraph/SceneGraphFactory.cs
View File

@@ -82,8 +82,7 @@ namespace FlaxEditor.SceneGraph
if (id == Guid.Empty)
return null;
SceneGraphNode result;
Nodes.TryGetValue(id, out result);
Nodes.TryGetValue(id, out SceneGraphNode result);
return result;
}
@@ -94,8 +93,7 @@ namespace FlaxEditor.SceneGraph
/// <returns>The result node.</returns>
public static SceneGraphNode GetNode(Guid id)
{
SceneGraphNode result;
Nodes.TryGetValue(id, out result);
Nodes.TryGetValue(id, out SceneGraphNode result);
if (result == null)
{
var actor = Object.TryFind<Actor>(ref id);