mirror of
https://github.com/TorqueGameEngines/Torque3D.git
synced 2026-04-19 11:25:27 +00:00
requirements for postfx
update to handle posteffects with image_asset_refactor
This commit is contained in:
parent
e1a2a6d9f9
commit
d86962d1fd
5 changed files with 42 additions and 39 deletions
|
|
@ -387,7 +387,7 @@ void ImageAsset::setImageFile(StringTableEntry pImageFile)
|
|||
if (mLoadedState == Ok)
|
||||
Torque::FS::RemoveChangeNotification(mImageFile, this, &ImageAsset::_onFileChanged);
|
||||
|
||||
if (String(pImageFile).startsWith("#"))
|
||||
if (String(pImageFile).startsWith("#") || String(pImageFile).startsWith("$"))
|
||||
{
|
||||
mImageFile = StringTable->insert(pImageFile);
|
||||
mIsNamedTarget = true;
|
||||
|
|
|
|||
|
|
@ -677,7 +677,6 @@ public:
|
|||
void _set##name(StringTableEntry _in, const U32& index){ \
|
||||
if(m##name##Asset[index].getAssetId() == _in) \
|
||||
return; \
|
||||
\
|
||||
if(!AssetDatabase.isDeclaredAsset(_in)) \
|
||||
{ \
|
||||
StringTableEntry imageAssetId = StringTable->EmptyString(); \
|
||||
|
|
@ -687,7 +686,7 @@ public:
|
|||
{ \
|
||||
imageAssetId = query.mAssetList[0]; \
|
||||
} \
|
||||
else if(Torque::FS::IsFile(_in)) \
|
||||
else if(Torque::FS::IsFile(_in) || (_in[0] == '$' || _in[0] == '#')) \
|
||||
{ \
|
||||
ImageAsset* privateImage = new ImageAsset(); \
|
||||
privateImage->setImageFile(_in); \
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue