GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions 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-22 22:43:29 +02:00
parent 20a4e348ef 248304a78f
commit 1c20398d8c
28 changed files with 294 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Source/Editor/Windows/ContentWindow.cs
View File

@@ -721,7 +721,12 @@ namespace FlaxEditor.Windows
{
var item = Editor.ContentDatabase.Find(sourcePath);
if (item != null)
Editor.ContentDatabase.Copy(item, Path.Combine(CurrentViewFolder.Path, item.FileName));
{
var newPath = StringUtils.NormalizePath(Path.Combine(CurrentViewFolder.Path, item.FileName));
if (sourcePath.Equals(newPath))
newPath = GetClonedAssetPath(item);
Editor.ContentDatabase.Copy(item, newPath);
}
else
importFiles.Add(sourcePath);
}