TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-16 00:54:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

ID10T issue

Browse source 
we dont want both fileChanged and resourcechanged.... causes issues
This commit is contained in:
marauder2k7 2025-03-27 19:34:11 +00:00
parent fc30d178af
commit db8c565416
2 changed files with 0 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Engine/source/T3D/assets/ImageAsset.cpp
View file

@ -363,10 +363,6 @@ void ImageAsset::setImageFile(StringTableEntry pImageFile)
if (pImageFile == mImageFile) if (pImageFile == mImageFile)
return; 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("$")) if (String(pImageFile).startsWith("#") || String(pImageFile).startsWith("$"))
{ {
mImageFile = StringTable->insert(pImageFile); mImageFile = StringTable->insert(pImageFile);
@ -420,7 +416,6 @@ U32 ImageAsset::load()
} }
else else
{ {
Torque::FS::AddChangeNotification(mImageFile, this, &ImageAsset::_onFileChanged);
mLoadedState = Ok; mLoadedState = Ok;
} }
@ -551,14 +546,6 @@ ImageAsset::ImageTypes ImageAsset::getImageTypeFromName(StringTableEntry name)
return (ImageTypes)ret; return (ImageTypes)ret;
} }
void ImageAsset::_onFileChanged(const Torque::Path& path)
{
if (path != Torque::Path(mImageFile))
return;
refreshAsset();
}
void ImageAsset::_onResourceChanged(const Torque::Path& path) void ImageAsset::_onResourceChanged(const Torque::Path& path)
{ {
if (path != Torque::Path(mImageFile)) if (path != Torque::Path(mImageFile))

1
Engine/source/T3D/assets/ImageAsset.h
View file

@ -206,7 +206,6 @@ protected:
// Asset Base callback // Asset Base callback
void initializeAsset(void) override; void initializeAsset(void) override;
void onAssetRefresh(void) override; void onAssetRefresh(void) override;
void _onFileChanged(const Torque::Path& path);
/// Taml callbacks. /// Taml callbacks.
void onTamlPreWrite(void) override; void onTamlPreWrite(void) override;