TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-12 23:24:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge pull request #820 from Azaezel/alpha40/shapeErrcodes

Browse source 
fix shape errorcodes
This commit is contained in:
Brian Roberts 2022-06-16 22:37:51 -05:00 • committed by GitHub
commit c8ef1c5c85
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -117,7 +117,7 @@ ConsoleSetType(TypeShapeAssetId)
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
const String ShapeAsset::mErrCodeStrings[] = const String ShapeAsset::mShapeErrCodeStrings[] =
{ {
"TooManyVerts", "TooManyVerts",
"TooManyBones", "TooManyBones",

4
Engine/source/T3D/assets/ShapeAsset.h
View file

@ -104,7 +104,7 @@ public:
static StringTableEntry smNoShapeAssetFallback; static StringTableEntry smNoShapeAssetFallback;
static const String mErrCodeStrings[ShapeAssetErrCode::Extended - Parent::Extended + 1]; static const String mShapeErrCodeStrings[ShapeAssetErrCode::Extended - Parent::Extended + 1];
static U32 getAssetErrCode(AssetPtr<ShapeAsset> shapeAsset) { if (shapeAsset) return shapeAsset->mLoadedState; else return 0; } static U32 getAssetErrCode(AssetPtr<ShapeAsset> shapeAsset) { if (shapeAsset) return shapeAsset->mLoadedState; else return 0; }
@ -112,7 +112,7 @@ public:
{ {
if (errCode < Parent::Extended) return Parent::getAssetErrstrn(errCode); if (errCode < Parent::Extended) return Parent::getAssetErrstrn(errCode);
if (errCode > ShapeAssetErrCode::Extended) return "undefined error"; if (errCode > ShapeAssetErrCode::Extended) return "undefined error";
return mErrCodeStrings[errCode]; return mShapeErrCodeStrings[errCode - Parent::Extended];
}; };
ShapeAsset(); ShapeAsset();