TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-02-28 11:03:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #790 from Areloch/MiscFixes20220524

Browse source 
Misc Fixes for 2022/05/24
This commit is contained in:
Brian Roberts 2022-05-25 00:25:37 -05:00 • committed by GitHub
commit dd801ec1a1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 10 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -221,8 +221,7 @@ StringTableEntry ImageAsset::getAssetIdByFilename(StringTableEntry fileName)
}
else
{
AssetPtr<ImageAsset> imageAsset = imageAssetId;
imageAsset->mLoadedState = AssetErrCode::BadFileReference;
AssetPtr<ImageAsset> imageAsset = imageAssetId; //ensures the fallback is loaded
}
return imageAssetId;

3
Engine/source/T3D/assets/ShapeAsset.cpp
View file

@ -475,8 +475,7 @@ StringTableEntry ShapeAsset::getAssetIdByFilename(StringTableEntry fileName)
}
else
{
AssetPtr<ShapeAsset> shapeAsset = shapeAssetId;
shapeAsset->mLoadedState = AssetErrCode::BadFileReference;
AssetPtr<ShapeAsset> shapeAsset = shapeAssetId; //ensures the fallback is loaded
}
return shapeAssetId;

4
Engine/source/T3D/tsStatic.cpp
View file

@ -419,6 +419,8 @@ bool TSStatic::_createShape()
// Reapply the current skin
mAppliedSkinName = "";
reSkin();
updateMaterials();
}
prepCollision();
@ -1619,8 +1621,6 @@ void TSStatic::updateMaterials()
}
}
mChangingMaterials.clear();
// Initialize the material instances
mShapeInstance->initMaterialList();
}