From db8c565416270eee48b2054442d5664d70d5c5d8 Mon Sep 17 00:00:00 2001 From: marauder2k7 Date: Thu, 27 Mar 2025 19:34:11 +0000 Subject: [PATCH] ID10T issue we dont want both fileChanged and resourcechanged.... causes issues --- Engine/source/T3D/assets/ImageAsset.cpp | 13 ------------- Engine/source/T3D/assets/ImageAsset.h | 1 - 2 files changed, 14 deletions(-) diff --git a/Engine/source/T3D/assets/ImageAsset.cpp b/Engine/source/T3D/assets/ImageAsset.cpp index a6ce52446..6829e82bd 100644 --- a/Engine/source/T3D/assets/ImageAsset.cpp +++ b/Engine/source/T3D/assets/ImageAsset.cpp @@ -363,10 +363,6 @@ void ImageAsset::setImageFile(StringTableEntry pImageFile) if (pImageFile == mImageFile) return; - // if we previously loaded, remove the listener for the file. - if (mLoadedState == Ok) - Torque::FS::RemoveChangeNotification(mImageFile, this, &ImageAsset::_onFileChanged); - if (String(pImageFile).startsWith("#") || String(pImageFile).startsWith("$")) { mImageFile = StringTable->insert(pImageFile); @@ -420,7 +416,6 @@ U32 ImageAsset::load() } else { - Torque::FS::AddChangeNotification(mImageFile, this, &ImageAsset::_onFileChanged); mLoadedState = Ok; } @@ -551,14 +546,6 @@ ImageAsset::ImageTypes ImageAsset::getImageTypeFromName(StringTableEntry name) return (ImageTypes)ret; } -void ImageAsset::_onFileChanged(const Torque::Path& path) -{ - if (path != Torque::Path(mImageFile)) - return; - - refreshAsset(); -} - void ImageAsset::_onResourceChanged(const Torque::Path& path) { if (path != Torque::Path(mImageFile)) diff --git a/Engine/source/T3D/assets/ImageAsset.h b/Engine/source/T3D/assets/ImageAsset.h index 90cc318f3..e372419a2 100644 --- a/Engine/source/T3D/assets/ImageAsset.h +++ b/Engine/source/T3D/assets/ImageAsset.h @@ -206,7 +206,6 @@ protected: // Asset Base callback void initializeAsset(void) override; void onAssetRefresh(void) override; - void _onFileChanged(const Torque::Path& path); /// Taml callbacks. void onTamlPreWrite(void) override;