Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ string[] movedFromAssetPaths
)
{
var addressableSettings = AddressableAssetSettingsDefaultObject.Settings;
var beforeHash = addressableSettings.currentHash;

// Check this because AddressableAssetSettingsDefaultObject.Settings may be null at this point when the Library folder is deleted.
if (addressableSettings == null)
Expand Down Expand Up @@ -57,16 +58,19 @@ string[] movedFromAssetPaths
foreach (var importedAssetPath in importedAssetPaths)
{
var guid = AssetDatabase.AssetPathToGUID(importedAssetPath);
applyService.Apply(guid, false, true);
applyService.Apply(guid, false, false);
}

foreach (var movedAssetPath in movedAssetPaths)
{
var guid = AssetDatabase.AssetPathToGUID(movedAssetPath);
applyService.Apply(guid, false, true);
applyService.Apply(guid, false, false);
}

applyService.InvokeBatchModificationEvent();
if (beforeHash != addressableSettings.currentHash)
{
applyService.InvokeBatchModificationEvent();
}
}

private static bool ShouldProcess(
Expand Down