more cleanups

cleanup the type removing the refactor tag
materialManager restored to its original state

Engine/source/T3D/assets/ImageAsset.cpp

@@ -67,16 +67,16 @@ IMPLEMENT_CONOBJECT(ImageAsset);
 IMPLEMENT_STRUCT(AssetPtr<ImageAsset>, AssetPtrImageAsset,, "")
 END_IMPLEMENT_STRUCT
 
-ConsoleType(ImageAssetPtr, TypeImageAssetPtrRefactor, AssetPtr<ImageAsset>, ASSET_ID_FIELD_PREFIX)
+ConsoleType(ImageAssetPtr, TypeImageAssetPtr, AssetPtr<ImageAsset>, ASSET_ID_FIELD_PREFIX)
 
 
-ConsoleGetType(TypeImageAssetPtrRefactor)
+ConsoleGetType(TypeImageAssetPtr)
 {
    // Fetch asset Id.
    return (*((AssetPtr<ImageAsset>*)dptr)).getAssetId();
 }
 
-ConsoleSetType(TypeImageAssetPtrRefactor)
+ConsoleSetType(TypeImageAssetPtr)
 {
    // Was a single argument specified?
    if (argc == 1)
@@ -662,7 +662,7 @@ void GuiInspectorTypeImageAssetPtr::consoleInit()
 {
    Parent::consoleInit();
 
-   ConsoleBaseType::getType(TypeImageAssetPtrRefactor)->setInspectorFieldType("GuiInspectorTypeImageAssetPtr");
+   ConsoleBaseType::getType(TypeImageAssetPtr)->setInspectorFieldType("GuiInspectorTypeImageAssetPtr");
 }
 
 GuiControl* GuiInspectorTypeImageAssetPtr::constructEditControl()

Engine/source/T3D/assets/ImageAsset.h

@@ -227,7 +227,7 @@ protected:
 };
 
 DECLARE_STRUCT(AssetPtr<ImageAsset>)
-DefineConsoleType(TypeImageAssetPtrRefactor, AssetPtr<ImageAsset> )
+DefineConsoleType(TypeImageAssetPtr, AssetPtr<ImageAsset> )
 
 typedef ImageAsset::ImageTypes ImageAssetType;
 DefineEnumType(ImageAssetType);
@@ -317,7 +317,7 @@ public:
 
 
 #define INITPERSISTFIELD_IMAGEASSET_REFACTOR(name, consoleClass, docs)                                                                                                        \
-   addProtectedField(assetText(name, Asset), TypeImageAssetPtrRefactor, Offset(m##name##Asset, consoleClass), _set##name##Data, &defaultProtectedGetFn, assetDoc(name, asset docs.));
+   addProtectedField(assetText(name, Asset), TypeImageAssetPtr, Offset(m##name##Asset, consoleClass), _set##name##Data, &defaultProtectedGetFn, assetDoc(name, asset docs.));
 
 
 #define DECLARE_IMAGEASSET_ARRAY_REFACTOR(className, name, profile, max)                                                                                                      \
@@ -404,7 +404,7 @@ public:
 
 
 #define INITPERSISTFIELD_IMAGEASSET_ARRAY_REFACTOR(name, arraySize, consoleClass, docs)                                                                                       \
-   addProtectedField(assetText(name, Asset), TypeImageAssetPtrRefactor, Offset(m##name##Asset, consoleClass), _set##name##Data, &defaultProtectedGetFn, arraySize, assetDoc(name, asset docs.));
+   addProtectedField(assetText(name, Asset), TypeImageAssetPtr, Offset(m##name##Asset, consoleClass), _set##name##Data, &defaultProtectedGetFn, arraySize, assetDoc(name, asset docs.));
 
 #define DEF_IMAGEASSET_ARRAY_BINDS_REFACTOR(className,name, max)\
 DefineEngineMethod(className, get##name, const char*, (S32 index), , "get name")\

Engine/source/gui/controls/guiPopUpCtrl.cpp

@@ -299,7 +299,7 @@ void GuiPopUpMenuCtrl::initPersistFields(void)
    addField("sbUsesNAColor",            TypeBool,         Offset(mRenderScrollInNA, GuiPopUpMenuCtrl));
    addField("reverseTextList",          TypeBool,         Offset(mReverseTextList, GuiPopUpMenuCtrl));
 
-   addProtectedField("BitmapAsset", TypeImageAssetPtrRefactor, Offset(mBitmapAsset, GuiPopUpMenuCtrl), _setBitmaps, &defaultProtectedGetFn, "@brief ""Bitmap"" ""asset \"\".");
+   addProtectedField("BitmapAsset", TypeImageAssetPtr, Offset(mBitmapAsset, GuiPopUpMenuCtrl), _setBitmaps, &defaultProtectedGetFn, "@brief ""Bitmap"" ""asset \"\".");
 
    addField("bitmapBounds",             TypePoint2I,      Offset(mBitmapBounds, GuiPopUpMenuCtrl));
 

Engine/source/gui/controls/guiPopUpCtrlEx.cpp

@@ -354,7 +354,7 @@ void GuiPopUpMenuCtrlEx::initPersistFields(void)
    addField("sbUsesNAColor",            TypeBool,         Offset(mRenderScrollInNA, GuiPopUpMenuCtrlEx), "Deprecated" "@internal");
    addField("reverseTextList",          TypeBool,         Offset(mReverseTextList, GuiPopUpMenuCtrlEx), "Reverses text list if popup extends up, instead of down");
 
-   addProtectedField("BitmapAsset", TypeImageAssetPtrRefactor, Offset(mBitmapAsset, GuiPopUpMenuCtrlEx), _setBitmaps, &defaultProtectedGetFn, "@brief ""Bitmap"" ""asset \"Name of bitmap asset to use\".");
+   addProtectedField("BitmapAsset", TypeImageAssetPtr, Offset(mBitmapAsset, GuiPopUpMenuCtrlEx), _setBitmaps, &defaultProtectedGetFn, "@brief ""Bitmap"" ""asset \"Name of bitmap asset to use\".");
 
    addField("bitmapBounds",             TypePoint2I,      Offset(mBitmapBounds, GuiPopUpMenuCtrlEx), "Boundaries of bitmap displayed");
    addField("hotTrackCallback",         TypeBool,         Offset(mHotTrackItems, GuiPopUpMenuCtrlEx),

Engine/source/gui/core/guiTypes.cpp

@@ -442,7 +442,7 @@ void GuiControlProfile::initPersistFields()
       "Texture to use for rendering control.", AbstractClassRep::FIELD_HideInInspectors);
 #endif
 
-      addProtectedField("bitmapAsset", TypeImageAssetPtrRefactor, Offset(mBitmapAsset, GuiControlProfile),
+      addProtectedField("bitmapAsset", TypeImageAssetPtr, Offset(mBitmapAsset, GuiControlProfile),
          &GuiControlProfile::protectedSetBitmap, &defaultProtectedGetFn,
          "Texture to use for rendering control.");
 

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 = TypeImageAssetPtrRefactor;
+         fieldType = TypeImageAssetPtr;
       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 = TypeImageAssetPtrRefactor;
+         fieldTypeMask = TypeImageAssetPtr;
       else if (newField->mFieldTypeName == StringTable->insert("shape"))
          fieldTypeMask = TypeShapeAssetId;
       else if (newField->mFieldTypeName == StringTable->insert("bool"))

Engine/source/materials/materialManager.cpp

@@ -358,7 +358,7 @@ void MaterialManager::flushAndReInitInstances()
       (*iter)->reInit();
 }
 
-void MaterialManager::_flushInstance( BaseMaterialDefinition *target )
+void MaterialManager::flushInstance( BaseMaterialDefinition *target )
 {
    Vector<BaseMatInstance*>::iterator iter = mMatInstanceList.begin();
    while ( iter != mMatInstanceList.end() )
@@ -372,7 +372,7 @@ void MaterialManager::_flushInstance( BaseMaterialDefinition *target )
    }
 }
 
-void MaterialManager::_reInitInstance( BaseMaterialDefinition *target )
+void MaterialManager::reInitInstance( BaseMaterialDefinition *target )
 {
    Vector<BaseMatInstance*>::iterator iter = mMatInstanceList.begin();
    for ( ; iter != mMatInstanceList.end(); iter++ )

Engine/source/materials/materialManager.h

@@ -117,20 +117,19 @@ public:
    /// the active materials instances immediately.
    void flushAndReInitInstances();
 
+   // Flush the instance
+   void flushInstance(BaseMaterialDefinition* target);
+
+   /// Re-initializes the material instances for a specific target material.   
+   void reInitInstance(BaseMaterialDefinition* target);
+
 protected:
 
    // MatInstance tracks it's instances here
    friend class MatInstance;
    void _track(MatInstance*);
    void _untrack(MatInstance*);
-   /// Flushes all the procedural shaders and re-initializes all
-   /// the active materials instances immediately.
-   void _flushAndReInitInstances();
-   // Flush the instance
-   void _flushInstance(BaseMaterialDefinition* target);
 
-   /// Re-initializes the material instances for a specific target material.   
-   void _reInitInstance(BaseMaterialDefinition* target);
    /// @see LightManager::smActivateSignal
    void _onLMActivate( const char *lm, bool activate );