Merge remote-tracking branch 'origin/master' into 1.13
# Conflicts: # Content/Shaders/DepthOfField.flax # Source/Engine/Content/Asset.cpp
This commit is contained in:
@@ -1261,7 +1261,6 @@ namespace FlaxEditor.Modules
|
||||
|
||||
private void OnImportFileDone(string path)
|
||||
{
|
||||
// Check if already has that element
|
||||
var item = Find(path);
|
||||
if (item is BinaryAssetItem binaryAssetItem)
|
||||
{
|
||||
@@ -1284,9 +1283,6 @@ namespace FlaxEditor.Modules
|
||||
binaryAssetItem.OnReimport(ref assetInfo.ID);
|
||||
}
|
||||
}
|
||||
|
||||
// Refresh content view (not the best design because window could also track this event but it gives better performance)
|
||||
Editor.Windows.ContentWin?.RefreshView();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user