diff --git a/Engine/source/T3D/assets/ImageAsset.cpp b/Engine/source/T3D/assets/ImageAsset.cpp index cec0cb496..8f62bd7f9 100644 --- a/Engine/source/T3D/assets/ImageAsset.cpp +++ b/Engine/source/T3D/assets/ImageAsset.cpp @@ -116,7 +116,7 @@ ConsoleSetType(TypeImageAssetId) IMPLEMENT_STRUCT(AssetPtr, AssetPtrImageAsset,, "") END_IMPLEMENT_STRUCT -ConsoleType(ImageAssetPtr, TypeImageAssetPtrRefactor, AssetPtr, "") +ConsoleType(ImageAssetPtr, TypeImageAssetPtrRefactor, AssetPtr, ASSET_ID_FIELD_PREFIX) ConsoleGetType(TypeImageAssetPtrRefactor) diff --git a/Engine/source/gui/core/guiTypes.cpp b/Engine/source/gui/core/guiTypes.cpp index ce1382203..bd5532aae 100644 --- a/Engine/source/gui/core/guiTypes.cpp +++ b/Engine/source/gui/core/guiTypes.cpp @@ -643,13 +643,13 @@ void GuiControlProfile::incLoadCount() if (mBitmapAsset.notNull() && mBitmapName != StringTable->insert("texHandle")) { 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 ++; diff --git a/Engine/source/gui/editor/inspector/group.cpp b/Engine/source/gui/editor/inspector/group.cpp index 2f517d52d..3dfd19248 100644 --- a/Engine/source/gui/editor/inspector/group.cpp +++ b/Engine/source/gui/editor/inspector/group.cpp @@ -663,7 +663,7 @@ void GuiInspectorGroup::addInspectorField(StringTableEntry name, StringTableEntr else if (typeName == StringTable->insert("material")) fieldType = TypeMaterialAssetId; else if (typeName == StringTable->insert("image")) - fieldType = TypeImageAssetId; + fieldType = TypeImageAssetPtrRefactor; else if (typeName == StringTable->insert("shape")) fieldType = TypeShapeAssetId; else if (typeName == StringTable->insert("sound")) diff --git a/Engine/source/gui/editor/inspector/variableInspector.cpp b/Engine/source/gui/editor/inspector/variableInspector.cpp index c856c8b1a..80195fc00 100644 --- a/Engine/source/gui/editor/inspector/variableInspector.cpp +++ b/Engine/source/gui/editor/inspector/variableInspector.cpp @@ -203,7 +203,7 @@ void GuiVariableInspector::addField(const char* name, const char* label, const c else if (newField->mFieldTypeName == StringTable->insert("material")) fieldTypeMask = TypeMaterialAssetId; else if (newField->mFieldTypeName == StringTable->insert("image")) - fieldTypeMask = TypeImageAssetId; + fieldTypeMask = TypeImageAssetPtrRefactor; else if (newField->mFieldTypeName == StringTable->insert("shape")) fieldTypeMask = TypeShapeAssetId; else if (newField->mFieldTypeName == StringTable->insert("bool"))