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

Merge remote-tracking branch 'origin/master' into 1.7

Browse Source
This commit is contained in:
Wojtek Figat
2023-09-11 22:43:46 +02:00
parent 6bbc74caf2 762960bee1
commit fb488cbaf7
53 changed files with 1537 additions and 218 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Source/Editor/Modules/ContentDatabaseModule.cs
View File

@@ -890,6 +890,23 @@ namespace FlaxEditor.Modules
}
if (sortChildren)
node.SortChildren();
// Ignore some special folders
if (node is MainContentTreeNode mainNode && mainNode.Folder.ShortName == "Source")
{
var mainNodeChild = mainNode.Folder.Find(StringUtils.CombinePaths(mainNode.Path, "obj")) as ContentFolder;
if (mainNodeChild != null)
{
mainNodeChild.Visible = false;
mainNodeChild.Node.Visible = false;
}
mainNodeChild = mainNode.Folder.Find(StringUtils.CombinePaths(mainNode.Path, "Properties")) as ContentFolder;
if (mainNodeChild != null)
{
mainNodeChild.Visible = false;
mainNodeChild.Node.Visible = false;
}
}
}
private void LoadScripts(ContentTreeNode parent, string[] files)