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/Modules/WindowsModule.cs
View File

@@ -415,8 +415,7 @@ namespace FlaxEditor.Modules
writer.WriteStartElement("Panel");
float splitterValue;
DockState state = p.TryGetDockState(out splitterValue);
DockState state = p.TryGetDockState(out float splitterValue);
writer.WriteAttributeString("DockState", ((int)state).ToString());
writer.WriteAttributeString("SplitterValue", splitterValue.ToString(CultureInfo.InvariantCulture));
@@ -684,8 +683,7 @@ namespace FlaxEditor.Modules
}
// Check if it's an asset ID
Guid id;
if (Guid.TryParse(typename, out id))
if (Guid.TryParse(typename, out Guid id))
{
var el = Editor.ContentDatabase.Find(id);
if (el != null)