mirror of
https://github.com/TorqueGameEngines/Torque3D.git
synced 2026-07-15 08:34:40 +00:00
Merge branch 'development' of https://github.com/vvv-yeaf/Torque3D into development
This commit is contained in:
commit
049028480f
7 changed files with 3 additions and 2 deletions
|
|
@ -207,8 +207,9 @@ void ShapeAsset::initializeAsset()
|
||||||
//Ensure our path is expando'd if it isn't already
|
//Ensure our path is expando'd if it isn't already
|
||||||
mFilePath = getOwned() ? expandAssetFilePath(mFileName) : mFilePath;
|
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;
|
mDiffuseImposterPath = getOwned() ? expandAssetFilePath(mDiffuseImposterFileName) : mDiffuseImposterFileName;
|
||||||
if (mDiffuseImposterPath == StringTable->EmptyString())
|
if (mDiffuseImposterPath == StringTable->EmptyString())
|
||||||
{
|
{
|
||||||
|
|
|
||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading…
Add table
Add a link
Reference in a new issue