Merge branch 'development' of https://github.com/vvv-yeaf/Torque3D into development

This commit is contained in:
vvv-yeaf 2022-09-20 22:00:39 -03:00
commit 049028480f
7 changed files with 3 additions and 2 deletions

View file

@ -207,8 +207,9 @@ void ShapeAsset::initializeAsset()
//Ensure our path is expando'd if it isn't already
mFilePath = getOwned() ? expandAssetFilePath(mFileName) : mFilePath;
mConstructorFilePath = getOwned() ? expandAssetFilePath(mConstructorFilePath) : mConstructorFilePath;
mConstructorFilePath = getOwned() ? expandAssetFilePath(mConstructorFileName) : mConstructorFilePath;
if (!Torque::FS::IsFile(mConstructorFilePath))
Con::errorf("ShapeAsset::initializeAsset (%s) could not find %s!", getAssetName(), mConstructorFilePath);
mDiffuseImposterPath = getOwned() ? expandAssetFilePath(mDiffuseImposterFileName) : mDiffuseImposterFileName;
if (mDiffuseImposterPath == StringTable->EmptyString())
{