console spam

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

Engine/source/T3D/assets/ImageAsset.cpp

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

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());
+         //verify the bitmap
+         if (!mBitmap)
+            Con::errorf("(%s) - Failed to load profile bitmap (%s)", getName(), getBitmapAsset().getAssetId());
 
-      constructBitmapArray();
+         constructBitmapArray();
+      }
    }
    
    mLoadCount ++;

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"))

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"))