From b3c8e0707d55d2c6ddcfe5c85383838c61f7b59b Mon Sep 17 00:00:00 2001 From: Areloch Date: Sat, 6 Aug 2022 14:05:02 -0500 Subject: [PATCH] Re-enables reimport of assets if there's no external originalFilePath defined(such as due to in-place import, or file path differs from original importing machine) --- .../assetBrowser/scripts/assetBrowser.tscript | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/Templates/BaseGame/game/tools/assetBrowser/scripts/assetBrowser.tscript b/Templates/BaseGame/game/tools/assetBrowser/scripts/assetBrowser.tscript index 66563e563..69e38bf2d 100644 --- a/Templates/BaseGame/game/tools/assetBrowser/scripts/assetBrowser.tscript +++ b/Templates/BaseGame/game/tools/assetBrowser/scripts/assetBrowser.tscript @@ -1023,8 +1023,20 @@ function AssetBrowser::reImportAsset(%this) %reimportingPath = %assetDef.originalFilePath; + if(%reimportingPath $= "" || !isFile(%reimportingPath)) + { + //if we have no defined original file path, attempt to re-import the + //current loosefile + if(%assetType $= "ShapeAsset") + %reimportingPath = %assetDef.getShapePath(); + else if(%assetType $= "ImageAsset") + %reimportingPath = %assetDef.getImagePath(); + else if(%assetType $= "SoundAsset") + %reimportingPath = %assetDef.getSoundPath(); + } + //first, double-check we have an originating file. if we don't then we need to basically go out looking for it - if(!isFile(%assetDef.originalFilePath)) + if(!isFile(%reimportingPath)) { //if(%assetType $= "ImageAsset") // %filters = ""; @@ -1089,7 +1101,7 @@ function AssetBrowserPreviewButton::onRightClick(%this) EditAssetPopup.enableItem(9, false); } - if(AssetDatabase.acquireAsset(EditAssetPopup.assetId)) + /*if(AssetDatabase.acquireAsset(EditAssetPopup.assetId)) { %assetDef = AssetDatabase.acquireAsset(EditAssetPopup.assetId); if(%assetDef.originalFilePath $= "" || !isFile(%assetDef.originalFilePath)) @@ -1099,7 +1111,7 @@ function AssetBrowserPreviewButton::onRightClick(%this) EditAssetPopup.enableItem(9, false); } AssetDatabase.releaseAsset(EditAssetPopup.assetId); - } + }*/ if(%assetType $= "LevelAsset") {