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.6

Browse Source 
# Conflicts:
#	Source/Editor/Scripting/CodeEditors/VisualStudioCodeEditor.cpp
#	Source/Tools/Flax.Build/Deps/Dependencies/OpenAL.cs
This commit is contained in:
Wojtek Figat
2023-04-22 18:59:41 +02:00
parent 644eb35b97 73ff053470
commit 390460907d
51 changed files with 1397 additions and 673 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Editor/Modules/PrefabsModule.cs
View File

@@ -90,7 +90,7 @@ namespace FlaxEditor.Modules
PrefabCreating?.Invoke(actor);
var proxy = Editor.ContentDatabase.GetProxy<Prefab>();
Editor.Windows.ContentWin.NewItem(proxy, actor, OnPrefabCreated);
Editor.Windows.ContentWin.NewItem(proxy, actor, OnPrefabCreated, actor.Name);
}
private void OnPrefabCreated(ContentItem contentItem)