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

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

Browse Source 
# Conflicts:
#	Source/Engine/Core/Math/BoundingSphere.cs
#	Source/Engine/Debug/DebugDraw.cpp
#	Source/Engine/Platform/Win32/Win32Platform.cpp
#	Source/Engine/Platform/Win32/Win32Platform.h
This commit is contained in:
Wojtek Figat
2021-02-23 22:32:17 +01:00
parent cf3ac7a26e 3ddd64df2a
commit 5a9ca6f130
129 changed files with 6085 additions and 1891 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Source/Editor/Windows/Assets/PrefabWindow.cs
View File

@@ -10,6 +10,7 @@ using FlaxEditor.SceneGraph;
using FlaxEditor.Viewport;
using FlaxEngine;
using FlaxEngine.GUI;
using Object = FlaxEngine.Object;
namespace FlaxEditor.Windows.Assets
{
@@ -22,7 +23,7 @@ namespace FlaxEditor.Windows.Assets
{
private readonly SplitPanel _split1;
private readonly SplitPanel _split2;
private TextBox _searchBox;
private readonly TextBox _searchBox;
private readonly PrefabTree _tree;
private readonly PrefabWindowViewport _viewport;
private readonly CustomEditorPresenter _propertiesEditor;