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

2
Source/Editor/CustomEditors/Dedicated/ScriptsEditor.cs
View File

@@ -624,7 +624,7 @@ namespace FlaxEditor.CustomEditors.Dedicated
// Create group
var title = CustomEditorsUtil.GetPropertyNameUI(scriptType.Name);
var group = layout.Group(title);
var group = layout.Group(title, editor);
if (Presenter.CacheExpandedGroups)
{
if (Editor.Instance.ProjectCache.IsCollapsedGroup(title))