TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-15 08:34:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

console spam

Browse source 
moved error printout in guiType guiControlProfile incLoadCount inside a check to make sure the profile has a bitmap asset set.

remove older typeImageAssetId from group and variable inspector classes
This commit is contained in:
marauder2k7 2024-12-26 13:59:46 +00:00
parent 32c6330b72
commit eb746a1142
4 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -116,7 +116,7 @@ ConsoleSetType(TypeImageAssetId)
IMPLEMENT_STRUCT(AssetPtr<ImageAsset>, AssetPtrImageAsset,, "") IMPLEMENT_STRUCT(AssetPtr<ImageAsset>, AssetPtrImageAsset,, "")
END_IMPLEMENT_STRUCT END_IMPLEMENT_STRUCT
ConsoleType(ImageAssetPtr, TypeImageAssetPtrRefactor, AssetPtr<ImageAsset>, "") ConsoleType(ImageAssetPtr, TypeImageAssetPtrRefactor, AssetPtr<ImageAsset>, ASSET_ID_FIELD_PREFIX)
ConsoleGetType(TypeImageAssetPtrRefactor) ConsoleGetType(TypeImageAssetPtrRefactor)

12
Engine/source/gui/core/guiTypes.cpp
View file

@ -643,13 +643,13 @@ void GuiControlProfile::incLoadCount()
if (mBitmapAsset.notNull() && mBitmapName != StringTable->insert("texHandle")) if (mBitmapAsset.notNull() && mBitmapName != StringTable->insert("texHandle"))
{ {
mBitmap = getBitmap(); mBitmap = getBitmap();
//verify the bitmap
if (!mBitmap)
Con::errorf("(%s) - Failed to load profile bitmap (%s)", getName(), getBitmapAsset().getAssetId());
constructBitmapArray();
} }
//verify the bitmap
if (!mBitmap)
Con::errorf("(%s) - Failed to load profile bitmap (%s)", getName(), getBitmapAsset().getAssetId());
constructBitmapArray();
} }
mLoadCount ++; mLoadCount ++;

2
Engine/source/gui/editor/inspector/group.cpp
View file

@ -663,7 +663,7 @@ void GuiInspectorGroup::addInspectorField(StringTableEntry name, StringTableEntr
else if (typeName == StringTable->insert("material")) else if (typeName == StringTable->insert("material"))
fieldType = TypeMaterialAssetId; fieldType = TypeMaterialAssetId;
else if (typeName == StringTable->insert("image")) else if (typeName == StringTable->insert("image"))
fieldType = TypeImageAssetId; fieldType = TypeImageAssetPtrRefactor;
else if (typeName == StringTable->insert("shape")) else if (typeName == StringTable->insert("shape"))
fieldType = TypeShapeAssetId; fieldType = TypeShapeAssetId;
else if (typeName == StringTable->insert("sound")) else if (typeName == StringTable->insert("sound"))

2
Engine/source/gui/editor/inspector/variableInspector.cpp
View file

@ -203,7 +203,7 @@ void GuiVariableInspector::addField(const char* name, const char* label, const c
else if (newField->mFieldTypeName == StringTable->insert("material")) else if (newField->mFieldTypeName == StringTable->insert("material"))
fieldTypeMask = TypeMaterialAssetId; fieldTypeMask = TypeMaterialAssetId;
else if (newField->mFieldTypeName == StringTable->insert("image")) else if (newField->mFieldTypeName == StringTable->insert("image"))
fieldTypeMask = TypeImageAssetId; fieldTypeMask = TypeImageAssetPtrRefactor;
else if (newField->mFieldTypeName == StringTable->insert("shape")) else if (newField->mFieldTypeName == StringTable->insert("shape"))
fieldTypeMask = TypeShapeAssetId; fieldTypeMask = TypeShapeAssetId;
else if (newField->mFieldTypeName == StringTable->insert("bool")) else if (newField->mFieldTypeName == StringTable->insert("bool"))