diff --git a/Engine/source/T3D/assets/ImageAsset.cpp b/Engine/source/T3D/assets/ImageAsset.cpp index fea2bca3e..eb5f5036d 100644 --- a/Engine/source/T3D/assets/ImageAsset.cpp +++ b/Engine/source/T3D/assets/ImageAsset.cpp @@ -147,7 +147,7 @@ void ImageAsset::consoleInit() Con::addVariable("$Core::NoImageAssetFallback", TypeString, &smNoImageAssetFallback, "The assetId of the texture to display when the requested image asset is missing.\n" "@ingroup GFX\n"); - + smNoImageAssetFallback = StringTable->insert(Con::getVariable("$Core::NoImageAssetFallback")); } @@ -274,6 +274,7 @@ void ImageAsset::loadImage() mLoadedState = Ok; mIsValidImage = true; + mChangeSignal.trigger(); return; } mLoadedState = BadFileReference; @@ -552,7 +553,7 @@ bool GuiInspectorTypeImageAssetPtr::renderTooltip(const Point2I& hoverPos, const if (texture.isNull()) return false; - // Render image at a reasonable screen size while + // Render image at a reasonable screen size while // keeping its aspect ratio... Point2I screensize = getRoot()->getWindowSize(); Point2I offset = hoverPos; diff --git a/Engine/source/T3D/assets/ScriptAsset.cpp b/Engine/source/T3D/assets/ScriptAsset.cpp index ee1b696d0..199c6402c 100644 --- a/Engine/source/T3D/assets/ScriptAsset.cpp +++ b/Engine/source/T3D/assets/ScriptAsset.cpp @@ -190,6 +190,11 @@ bool ScriptAsset::execScript() if (handle) 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; }