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

* BugFix: Invert the corrections made in ImageAsset and ScriptAsset to be correct.

Browse source
This commit is contained in:
Robert MacGregor 2021-10-07 13:16:55 -04:00
parent 74cc60508b
commit 2d55fcf1bc
2 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -147,7 +147,7 @@ void ImageAsset::consoleInit()
Con::addVariable("$Core::NoImageAssetFallback", TypeString, &smNoImageAssetFallback, Con::addVariable("$Core::NoImageAssetFallback", TypeString, &smNoImageAssetFallback,
"The assetId of the texture to display when the requested image asset is missing.\n" "The assetId of the texture to display when the requested image asset is missing.\n"
"@ingroup GFX\n"); "@ingroup GFX\n");
smNoImageAssetFallback = StringTable->insert(Con::getVariable("$Core::NoImageAssetFallback")); smNoImageAssetFallback = StringTable->insert(Con::getVariable("$Core::NoImageAssetFallback"));
} }
@ -274,6 +274,7 @@ void ImageAsset::loadImage()
mLoadedState = Ok; mLoadedState = Ok;
mIsValidImage = true; mIsValidImage = true;
mChangeSignal.trigger();
return; return;
} }
mLoadedState = BadFileReference; mLoadedState = BadFileReference;
@ -552,7 +553,7 @@ bool GuiInspectorTypeImageAssetPtr::renderTooltip(const Point2I& hoverPos, const
if (texture.isNull()) if (texture.isNull())
return false; return false;
// Render image at a reasonable screen size while // Render image at a reasonable screen size while
// keeping its aspect ratio... // keeping its aspect ratio...
Point2I screensize = getRoot()->getWindowSize(); Point2I screensize = getRoot()->getWindowSize();
Point2I offset = hoverPos; Point2I offset = hoverPos;

5
Engine/source/T3D/assets/ScriptAsset.cpp
View file

@ -190,6 +190,11 @@ bool ScriptAsset::execScript()
if (handle) if (handle)
return true; return true;
if (Torque::FS::IsScriptFile(mScriptPath))
{
return Con::executeFile(mScriptPath, false, false);
}
Con::errorf("ScriptAsset:execScript() - Script asset must have a valid file to exec");
return false; return false;
} }