Added getShapeConstructorFilePath console function on shapeAsset

Fixed typo in import config settings for DuplicateAutoResolution
Converted TSShapeConstructor to utilize assets
Updated shape editor to work with assetified constructors
Converted guiBitmapButtonCtrl to use assets

Engine/source/T3D/assets/ShapeAsset.cpp

@@ -536,12 +536,19 @@ DefineEngineMethod(ShapeAsset, getAnimation, ShapeAnimationAsset*, (S32 index),
 }
 
 DefineEngineMethod(ShapeAsset, getShapeFile, const char*, (), ,
-   "Creates a new script asset using the targetFilePath.\n"
+   "Gets the shape's file path\n"
-   "@return The bool result of calling exec")
+   "@return The filename of the shape file")
 {
    return object->getShapeFilePath();
 }
 
+DefineEngineMethod(ShapeAsset, getShapeConstructorFilePath, const char*, (), ,
+   "Gets the shape's constructor file.\n"
+   "@return The filename of the shape constructor file")
+{
+   return object->getShapeConstructorFilePath();
+}
+
 DefineEngineMethod(ShapeAsset, getStatusString, String, (), , "get status string")\
 {
    return ShapeAsset::getAssetErrstrn(object->getStatus());

Engine/source/T3D/assets/assetImporter.cpp

@@ -32,7 +32,7 @@ ConsoleDocClass(AssetImportConfig,
 IMPLEMENT_CONOBJECT(AssetImportConfig);
 
 AssetImportConfig::AssetImportConfig() :
-   DuplicatAutoResolution("AutoRename"),
+   DuplicateAutoResolution("AutoRename"),
    WarningsAsErrors(false),
    PreventImportWithErrors(true),
    AutomaticallyPromptMissingFiles(false),
@@ -132,7 +132,7 @@ void AssetImportConfig::initPersistFields()
    Parent::initPersistFields();
 
    addGroup("General");
-      addField("DuplicatAutoResolution", TypeRealString, Offset(DuplicatAutoResolution, AssetImportConfig), "Duplicate Asset Auto-Resolution Action. Options are None, AutoPrune, AutoRename, FolderPrefix");
+      addField("DuplicateAutoResolution", TypeRealString, Offset(DuplicateAutoResolution, AssetImportConfig), "Duplicate Asset Auto-Resolution Action. Options are None, AutoPrune, AutoRename, FolderPrefix");
       addField("WarningsAsErrors", TypeBool, Offset(WarningsAsErrors, AssetImportConfig), "Indicates if warnings should be treated as errors");
       addField("PreventImportWithErrors", TypeBool, Offset(PreventImportWithErrors, AssetImportConfig), "Indicates if importing should be prevented from completing if any errors are detected at all");
       addField("AutomaticallyPromptMissingFiles", TypeBool, Offset(AutomaticallyPromptMissingFiles, AssetImportConfig), "Should the importer automatically prompt to find missing files if they are not detected automatically by the importer");
@@ -230,7 +230,7 @@ void AssetImportConfig::initPersistFields()
 void AssetImportConfig::loadImportConfig(Settings* configSettings, String configName)
 {
    //General
-   DuplicatAutoResolution = configSettings->value(String(configName + "/General/DuplicatAutoResolution").c_str());
+   DuplicateAutoResolution = configSettings->value(String(configName + "/General/DuplicateAutoResolution").c_str());
    WarningsAsErrors = dAtob(configSettings->value(String(configName + "/General/WarningsAsErrors").c_str()));
    PreventImportWithErrors = dAtob(configSettings->value(String(configName + "/General/PreventImportWithErrors").c_str()));
    AutomaticallyPromptMissingFiles = dAtob(configSettings->value(String(configName + "/General/AutomaticallyPromptMissingFiles").c_str()));
@@ -320,7 +320,7 @@ void AssetImportConfig::loadImportConfig(Settings* configSettings, String config
 
 void AssetImportConfig::CopyTo(AssetImportConfig* target) const
 {
-   target->DuplicatAutoResolution = DuplicatAutoResolution;
+   target->DuplicateAutoResolution = DuplicateAutoResolution;
    target->WarningsAsErrors = WarningsAsErrors;
    target->PreventImportWithErrors = PreventImportWithErrors;
    target->AutomaticallyPromptMissingFiles = AutomaticallyPromptMissingFiles;
@@ -2345,7 +2345,7 @@ void AssetImporter::resolveAssetItemIssues(AssetImportObject* assetItem)
       String humanReadableReason = assetItem->statusType == String("DuplicateImportAsset") ? "Importing asset was duplicate of another importing asset" : "Importing asset was duplicate of an existing asset";
 
       //get the config value for duplicateAutoResolution
-      if (activeImportConfig->DuplicatAutoResolution == String("AutoPrune"))
+      if (activeImportConfig->DuplicateAutoResolution == String("AutoPrune"))
       {
          //delete the item
          deleteImportingAsset(assetItem);
@@ -2356,7 +2356,7 @@ void AssetImporter::resolveAssetItemIssues(AssetImportObject* assetItem)
 
          importIssues = false;
       }
-      else if (activeImportConfig->DuplicatAutoResolution == String("AutoRename"))
+      else if (activeImportConfig->DuplicateAutoResolution == String("AutoRename"))
       {
          //Set trailing number
          String renamedAssetName = assetItem->assetName;
@@ -2375,11 +2375,11 @@ void AssetImporter::resolveAssetItemIssues(AssetImportObject* assetItem)
          resetAssetValidationStatus(assetItem);
          importIssues = false;
       }
-      else if (activeImportConfig->DuplicatAutoResolution == String("UseExisting"))
+      else if (activeImportConfig->DuplicateAutoResolution == String("UseExisting"))
       {
 
       }
-      else if (activeImportConfig->DuplicatAutoResolution == String("FolderPrefix"))
+      else if (activeImportConfig->DuplicateAutoResolution == String("FolderPrefix"))
       {
          //Set trailing number
          String renamedAssetName = assetItem->assetName;
@@ -3150,7 +3150,7 @@ Torque::Path AssetImporter::importShapeAsset(AssetImportObject* assetItem)
       activityLog.push_back(importLogBuffer);
 
       //find/create shape constructor
-      TSShapeConstructor* constructor = TSShapeConstructor::findShapeConstructor(Torque::Path(qualifiedToFile).getFullPath());
+      TSShapeConstructor* constructor = TSShapeConstructor::findShapeConstructorByFilename(Torque::Path(qualifiedToFile).getFullPath());
       if (constructor == nullptr)
       {
          constructor = new TSShapeConstructor(StringTable->insert(qualifiedToFile));

Engine/source/T3D/assets/assetImporter.h

@@ -22,7 +22,7 @@ public:
    /// <summary>
    /// Duplicate Asset Auto-Resolution Action. Options are None, AutoPrune, AutoRename
    /// </summary>
-   String DuplicatAutoResolution;
+   String DuplicateAutoResolution;
 
    /// <summary>
    /// Indicates if warnings should be treated as errors.

Engine/source/T3D/lighting/reflectionProbe.cpp

@@ -111,6 +111,7 @@ ReflectionProbe::ReflectionProbe()
 
    mUseHDRCaptures = true;
 
+   mCubemapName = StringTable->EmptyString();
    mStaticCubemap = NULL;
    mProbeUniqueID = "";
 
@@ -259,7 +260,7 @@ bool ReflectionProbe::_setReflectionMode(void *object, const char *index, const
    {
       //Clear our cubemap if we changed it to be baked, just for cleanliness
       probe->mReflectionModeType = BakedCubemap;
-      probe->mCubemapName = "";
+      probe->mCubemapName = StringTable->EmptyString();
    }
 
    probe->setMaskBits(StaticDataMask);

Engine/source/console/fileSystemFunctions.cpp

@@ -398,6 +398,21 @@ DefineEngineFunction(isFile, bool, ( const char* fileName ),,
    return Torque::FS::IsFile(givenPath);
 }
 
+DefineEngineFunction(isScriptFile, bool, (const char* fileName), ,
+   "@brief Determines if the specified file exists or not\n\n"
+
+   "@param fileName The path to the file.\n"
+   "@return Returns true if the file was found.\n"
+
+   "@ingroup FileSystem")
+{
+   String cleanfilename(Torque::Path::CleanSeparators(fileName));
+   Con::expandScriptFilename(sgScriptFilenameBuffer, sizeof(sgScriptFilenameBuffer), cleanfilename.c_str());
+
+   Torque::Path givenPath(Torque::Path::CompressPath(sgScriptFilenameBuffer));
+   return Torque::FS::IsScriptFile(givenPath.getFullPath());
+}
+
 DefineEngineFunction( IsDirectory, bool, ( const char* directory ),,
    "@brief Determines if a specified directory exists or not\n\n"
 

Engine/source/gui/buttons/guiBitmapButtonCtrl.cpp

@@ -128,6 +128,8 @@ GuiBitmapButtonCtrl::GuiBitmapButtonCtrl()
    mUseStates = true;
    setExtent( 140, 30 );
    mMasked = false;
+
+   INIT_IMAGEASSET(Bitmap);
 }
 
 //-----------------------------------------------------------------------------
@@ -136,12 +138,11 @@ void GuiBitmapButtonCtrl::initPersistFields()
 {
    addGroup( "Bitmap" );
 
-      addProtectedField( "bitmap", TypeStringFilename, Offset( mBitmapName, GuiBitmapButtonCtrl ),
+      INITPERSISTFIELD_IMAGEASSET(Bitmap, GuiBitmapButtonCtrl, "Texture file to display on this button.\n"
-         &_setBitmap, &defaultProtectedGetFn,
-         "Texture file to display on this button.\n"
          "If useStates is false, this will be the file that renders on the control.  Otherwise, this will "
          "specify the default texture name to which the various state and modifier suffixes are appended "
          "to find the per-state and per-modifier (if enabled) textures.");
+
       addField( "bitmapMode", TYPEID< BitmapMode >(), Offset( mBitmapMode, GuiBitmapButtonCtrl ),
          "Behavior for fitting the bitmap to the control extents.\n"
          "If set to 'Stretched', the bitmap will be stretched both verticall and horizontally to fit inside "
@@ -176,7 +177,7 @@ bool GuiBitmapButtonCtrl::onWake()
       return false;
       
    setActive( true );
-   setBitmap( mBitmapName );
+   setBitmap( getBitmap() );
    
    return true;
 }
@@ -208,22 +209,22 @@ bool GuiBitmapButtonCtrl::_setAutoFitExtents( void *object, const char *index, c
 
 //-----------------------------------------------------------------------------
 
-bool GuiBitmapButtonCtrl::_setBitmap( void *object, const char *index, const char *data )
+/*bool GuiBitmapButtonCtrl::_setBitmap(void* object, const char* index, const char* data)
 {
    GuiBitmapButtonCtrl* ctrl = reinterpret_cast< GuiBitmapButtonCtrl* >( object );
    ctrl->setBitmap( StringTable->insert(data) );
    return false;
-}
+}*/
 
 //-----------------------------------------------------------------------------
 
 // Legacy method.  Can just assign to bitmap field.
-DefineEngineMethod( GuiBitmapButtonCtrl, setBitmap, void, ( const char* path ),,
+/*DefineEngineMethod(GuiBitmapButtonCtrl, setBitmap, void, (const char* path), ,
    "Set the bitmap to show on the button.\n"
    "@param path Path to the texture file in any of the supported formats.\n" )
 {
    object->setBitmap( StringTable->insert(path) );
-}
+}*/
 
 //-----------------------------------------------------------------------------
 
@@ -282,13 +283,13 @@ void GuiBitmapButtonCtrl::setBitmap( StringTableEntry name )
 {
    PROFILE_SCOPE( GuiBitmapButtonCtrl_setBitmap );
    
-   mBitmapName = name;
+   _setBitmap(name);
    if( !isAwake() )
       return;
 
-   if( mBitmapName != StringTable->EmptyString())
+   if( mBitmapAsset.notNull())
    {
-      if( dStricmp( mBitmapName, "texhandle" ) != 0 )
+      if( dStricmp( getBitmap(), "texhandle" ) != 0 )
       {
          const U32 count = mUseModifiers ? NumModifiers : 1;
          for( U32 i = 0; i < count; ++ i )
@@ -301,31 +302,102 @@ void GuiBitmapButtonCtrl::setBitmap( StringTableEntry name )
                "_shift"
             };
             
-            static String s_n = "_n";
+            static String s_n[2] = { "_n", "_n_image" };
-            static String s_d = "_d";
+            static String s_d[2] = { "_d", "_d_image" };
-            static String s_h = "_h";
+            static String s_h[2] = { "_h", "_h_image" };
-            static String s_i = "_i";
+            static String s_i[2] = { "_i", "_i_image" };
+
+            String baseName = mBitmapAssetId;
+
+            //strip any pre-assigned suffix, just in case
+            baseName = baseName.replace("_n_image", "");
+            baseName = baseName.replace("_n", "");
 
-            String baseName = mBitmapName;
             if( mUseModifiers )
                baseName += modifiers[ i ];
 
-            mTextures[ i ].mTextureNormal = GFXTexHandle( baseName, &GFXDefaultGUIProfile, avar("%s() - mTextureNormal (line %d)", __FUNCTION__, __LINE__));
+            mTextures[ i ].mTextureNormal = GFXTexHandle( mBitmapAsset->getImagePath(), &GFXDefaultGUIProfile, avar("%s() - mTextureNormal (line %d)", __FUNCTION__, __LINE__));
             
             if( mUseStates )
+            {
+               //normal lookup
+               StringTableEntry lookupName;
+               for (U32 s = 0; s < 2; s++)
                {
                   if (!mTextures[i].mTextureNormal)
-                  mTextures[ i ].mTextureNormal = GFXTexHandle( baseName + s_n, &GFXDefaultGUIProfile, avar("%s() - mTextureNormal (line %d)", __FUNCTION__, __LINE__));
+                  {
+                     lookupName = StringTable->insert(String(baseName + s_n[s]).c_str());
+                     if (AssetDatabase.isDeclaredAsset(lookupName))
+                     {
+                        mTextures[i].mTextureNormalAssetId = lookupName;
+                        mTextures[i].mTextureNormalAsset = mTextures[i].mTextureNormalAssetId;
+                     }
+
+                     if (mTextures[i].mTextureNormalAsset.notNull() && mTextures[i].mTextureNormalAsset->getStatus() == AssetBase::Ok)
+                     {
+                        mTextures[i].mTextureNormal = GFXTexHandle(mTextures[i].mTextureNormalAsset->getImagePath(), &GFXDefaultGUIProfile, avar("%s() - mTextureNormal (line %d)", __FUNCTION__, __LINE__));
+                        break;
+                     }
+                  }
+               }
+
+               //Hilight lookup
+               for (U32 s = 0; s < 2; s++)
+               {
+                  lookupName = StringTable->insert(String(baseName + s_h[s]).c_str());
+                  if (AssetDatabase.isDeclaredAsset(lookupName))
+                  {
+                     mTextures[i].mTextureHilightAssetId = lookupName;
+                     mTextures[i].mTextureHilightAsset = mTextures[i].mTextureHilightAssetId;
+                  }
+
+                  if (mTextures[i].mTextureHilightAsset.notNull() && mTextures[i].mTextureHilightAsset->getStatus() == AssetBase::Ok)
+                  {
+                     mTextures[i].mTextureHilight = GFXTexHandle(mTextures[i].mTextureHilightAsset->getImagePath(), &GFXDefaultGUIProfile, avar("%s() - mTextureHighlight (line %d)", __FUNCTION__, __LINE__));
+                     break;
+                  }
+               }
 
-               mTextures[ i ].mTextureHilight = GFXTexHandle( baseName + s_h, &GFXDefaultGUIProfile, avar("%s() - mTextureHighlight (line %d)", __FUNCTION__, __LINE__));
                if( !mTextures[ i ].mTextureHilight )
                   mTextures[ i ].mTextureHilight = mTextures[ i ].mTextureNormal;
 
-               mTextures[ i ].mTextureDepressed = GFXTexHandle( baseName + s_d, &GFXDefaultGUIProfile, avar("%s() - mTextureDepressed (line %d)", __FUNCTION__, __LINE__));
+               //Depressed lookup
+               for (U32 s = 0; s < 2; s++)
+               {
+                  lookupName = StringTable->insert(String(baseName + s_d[s]).c_str());
+                  if (AssetDatabase.isDeclaredAsset(lookupName))
+                  {
+                     mTextures[i].mTextureDepressedAssetId = lookupName;
+                     mTextures[i].mTextureDepressedAsset = mTextures[i].mTextureDepressedAssetId;
+                  }
+
+                  if (mTextures[i].mTextureDepressedAsset.notNull() && mTextures[i].mTextureDepressedAsset->getStatus() == AssetBase::Ok)
+                  {
+                     mTextures[i].mTextureDepressed = GFXTexHandle(mTextures[i].mTextureDepressedAsset->getImagePath(), &GFXDefaultGUIProfile, avar("%s() - mTextureDepressed (line %d)", __FUNCTION__, __LINE__));
+                     break;
+                  }
+               }
+
                if( !mTextures[ i ].mTextureDepressed )
                   mTextures[ i ].mTextureDepressed = mTextures[ i ].mTextureHilight;
 
-               mTextures[ i ].mTextureInactive = GFXTexHandle( baseName + s_i, &GFXDefaultGUIProfile, avar("%s() - mTextureInactive (line %d)", __FUNCTION__, __LINE__));
+               //Depressed lookup
+               for (U32 s = 0; s < 2; s++)
+               {
+                  lookupName = StringTable->insert(String(baseName + s_i[s]).c_str());
+                  if (AssetDatabase.isDeclaredAsset(lookupName))
+                  {
+                     mTextures[i].mTextureInactiveAssetId = lookupName;
+                     mTextures[i].mTextureInactiveAsset = mTextures[i].mTextureInactiveAssetId;
+                  }
+
+                  if (mTextures[i].mTextureInactiveAsset.notNull() && mTextures[i].mTextureInactiveAsset->getStatus() == AssetBase::Ok)
+                  {
+                     mTextures[i].mTextureInactive = GFXTexHandle(mTextures[i].mTextureInactiveAsset->getImagePath(), &GFXDefaultGUIProfile, avar("%s() - mTextureInactive (line %d)", __FUNCTION__, __LINE__));
+                     break;
+                  }
+               }
+
                if( !mTextures[ i ].mTextureInactive )
                   mTextures[ i ].mTextureInactive = mTextures[ i ].mTextureNormal;
             }
@@ -595,3 +667,5 @@ bool GuiBitmapButtonCtrl::pointInControl(const Point2I& parentCoordPoint)
    else
       return Parent::pointInControl(parentCoordPoint);
 }
+
+DEF_IMAGEASSET_BINDS(GuiBitmapButtonCtrl, Bitmap);

Engine/source/gui/buttons/guiBitmapButtonCtrl.h

@@ -84,15 +84,23 @@ class GuiBitmapButtonCtrl : public GuiButtonCtrl
       struct Textures
       {
          /// Texture for normal state.
+         StringTableEntry mTextureNormalAssetId;
+         AssetPtr<ImageAsset> mTextureNormalAsset;
          GFXTexHandle mTextureNormal;
          
          /// Texture for highlight state.
+         StringTableEntry mTextureHilightAssetId;
+         AssetPtr<ImageAsset> mTextureHilightAsset;
          GFXTexHandle mTextureHilight;
          
          /// Texture for depressed state.
+         StringTableEntry mTextureDepressedAssetId;
+         AssetPtr<ImageAsset> mTextureDepressedAsset;
          GFXTexHandle mTextureDepressed;
          
          /// Texture for inactive state.
+         StringTableEntry mTextureInactiveAssetId;
+         AssetPtr<ImageAsset> mTextureInactiveAsset;
          GFXTexHandle mTextureInactive;
       };
 
@@ -110,8 +118,8 @@ class GuiBitmapButtonCtrl : public GuiButtonCtrl
       ///
       BitmapMode mBitmapMode;
 
-      /// File name for bitmap.
+      DECLARE_IMAGEASSET(GuiBitmapButtonCtrl, Bitmap, onBitmapChange, GFXDefaultGUIProfile);
-      StringTableEntry mBitmapName;
+      DECLARE_IMAGEASSET_SETGET(GuiBitmapButtonCtrl, Bitmap);
       
       /// alpha masking
       bool mMasked;
@@ -122,7 +130,7 @@ class GuiBitmapButtonCtrl : public GuiButtonCtrl
       virtual void renderButton( GFXTexHandle &texture, const Point2I& offset, const RectI& updateRect );
       
       static bool _setAutoFitExtents( void *object, const char *index, const char *data );
-      static bool _setBitmap( void *object, const char *index, const char *data );
+      //static bool _setBitmap( void *object, const char *index, const char *data );
       
       State getState() const
       {
@@ -149,6 +157,8 @@ class GuiBitmapButtonCtrl : public GuiButtonCtrl
       
       /// @}
 
+      void onBitmapChange() {}
+
    public:
                            
       GuiBitmapButtonCtrl();

Engine/source/gui/editor/guiShapeEdPreview.cpp

@@ -35,6 +35,9 @@
 #include "gfx/gfxDrawUtil.h"
 #include "collision/concretePolyList.h"
 
+#include "T3D/assets/ShapeAsset.h"
+#include "T3D/assets/ShapeAnimationAsset.h"
+
 #ifdef TORQUE_COLLADA
    #include "collision/optimizedPolyList.h"
    #include "ts/collada/colladaUtils.h"
@@ -399,6 +402,35 @@ bool GuiShapeEdPreview::setObjectModel(const char* modelName)
    return true;
 }
 
+bool GuiShapeEdPreview::setObjectShapeAsset(const char* assetId)
+{
+   SAFE_DELETE(mModel);
+   unmountAll();
+   mThreads.clear();
+   mActiveThread = -1;
+
+   StringTableEntry modelName = StringTable->EmptyString();
+   if (AssetDatabase.isDeclaredAsset(assetId))
+   {
+      StringTableEntry id = StringTable->insert(assetId);
+      StringTableEntry assetType = AssetDatabase.getAssetType(id);
+      if (assetType == StringTable->insert("ShapeAsset"))
+      {
+         ShapeAsset* asset = AssetDatabase.acquireAsset<ShapeAsset>(id);
+         modelName = asset->getShapeFilePath();
+         AssetDatabase.releaseAsset(id);
+      }
+      else if (assetType == StringTable->insert("ShapeAnimationAsset"))
+      {
+         ShapeAnimationAsset* asset = AssetDatabase.acquireAsset<ShapeAnimationAsset>(id);
+         modelName = asset->getAnimationPath();
+         AssetDatabase.releaseAsset(id);
+      }
+   }
+
+   return setObjectModel(modelName);
+}
+
 void GuiShapeEdPreview::_onResourceChanged(const Torque::Path& path)
 {
    if (path != Torque::Path(mModelName))
@@ -1717,6 +1749,14 @@ DefineEngineMethod( GuiShapeEdPreview, setModel, bool, ( const char* shapePath )
    return object->setObjectModel( shapePath );
 }
 
+DefineEngineMethod(GuiShapeEdPreview, setShapeAsset, bool, (const char* shapeAsset), ,
+   "Sets the model to be displayed in this control\n\n"
+   "@param shapeName Name of the model to display.\n"
+   "@return True if the model was loaded successfully, false otherwise.\n")
+{
+   return object->setObjectShapeAsset(shapeAsset);
+}
+
 DefineEngineMethod( GuiShapeEdPreview, fitToShape, void, (),,
    "Adjust the camera position and zoom to fit the shape within the view.\n\n" )
 {

Engine/source/gui/editor/guiShapeEdPreview.h

@@ -199,6 +199,7 @@ public:
 
    void setCurrentDetail(S32 dl);
    bool setObjectModel(const char * modelName);
+   bool setObjectShapeAsset(const char* assetId);
 
    void _onResourceChanged(const Torque::Path& path);
 

Engine/source/ts/assimp/assimpShapeLoader.cpp

@@ -805,7 +805,7 @@ TSShape* assimpLoadShape(const Torque::Path &path)
 
    // Allow TSShapeConstructor object to override properties
    ColladaUtils::getOptions().reset();
-   TSShapeConstructor* tscon = TSShapeConstructor::findShapeConstructor(path.getFullPath());
+   TSShapeConstructor* tscon = TSShapeConstructor::findShapeConstructorByFilename(path.getFullPath());
    if (tscon)
    {
       ColladaUtils::getOptions() = tscon->mOptions;

Engine/source/ts/collada/colladaShapeLoader.cpp

@@ -693,7 +693,7 @@ TSShape* loadColladaShape(const Torque::Path &path)
 
    // Allow TSShapeConstructor object to override properties
    ColladaUtils::getOptions().reset();
-   TSShapeConstructor* tscon = TSShapeConstructor::findShapeConstructor(path.getFullPath());
+   TSShapeConstructor* tscon = TSShapeConstructor::findShapeConstructorByFilename(path.getFullPath());
    if (tscon)
    {
       ColladaUtils::getOptions() = tscon->mOptions;

Engine/source/ts/tsShapeConstruct.cpp

@@ -57,7 +57,9 @@ IMPLEMENT_CALLBACK( TSShapeConstructor, onUnload, void, (), (),
 ImplementEnumType(TSShapeConstructorUpAxis,
    "Axis to use for upwards direction when importing from Collada.\n\n"
    "@ingroup TSShapeConstructor")
-   { UPAXISTYPE_X_UP,   "X_AXIS" },
+{
+UPAXISTYPE_X_UP, "X_AXIS"
+},
 { UPAXISTYPE_Y_UP,   "Y_AXIS" },
 { UPAXISTYPE_Z_UP,   "Z_AXIS" },
 { UPAXISTYPE_COUNT,  "DEFAULT" }
@@ -66,7 +68,9 @@ EndImplementEnumType;
 ImplementEnumType(TSShapeConstructorLodType,
    "\n\n"
    "@ingroup TSShapeConstructor")
-   { ColladaUtils::ImportOptions::DetectDTS,       "DetectDTS" },
+{
+   ColladaUtils::ImportOptions::DetectDTS, "DetectDTS"
+},
 { ColladaUtils::ImportOptions::SingleSize,      "SingleSize" },
 { ColladaUtils::ImportOptions::TrailingNumber,  "TrailingNumber" },
    EndImplementEnumType;
@@ -74,7 +78,9 @@ EndImplementEnumType;
 ImplementEnumType(TSShapeConstructorAnimType,
    "\n\n"
    "@ingroup TSShapeConstructor")
-   { ColladaUtils::ImportOptions::FrameCount,      "Frames" },
+{
+   ColladaUtils::ImportOptions::FrameCount, "Frames"
+},
 { ColladaUtils::ImportOptions::Seconds,         "Seconds" },
 { ColladaUtils::ImportOptions::Milliseconds,    "Milliseconds" },
    EndImplementEnumType;
@@ -91,7 +97,7 @@ ResourceRegisterUnloadSignal< TSShape > TSShapeConstructor::_smAutoUnload( &TSSh
 
 void TSShapeConstructor::_onTSShapeLoaded(Resource< TSShape >& resource)
 {
-   TSShapeConstructor* ctor = findShapeConstructor( resource.getPath().getFullPath() );
+   TSShapeConstructor* ctor = findShapeConstructorByFilename(resource.getPath().getFullPath());
    if (ctor)
       ctor->_onLoad(resource);
 
@@ -103,7 +109,7 @@ void TSShapeConstructor::_onTSShapeLoaded( Resource< TSShape >& resource )
 
 void TSShapeConstructor::_onTSShapeUnloaded(const Torque::Path& path, TSShape* shape)
 {
-   TSShapeConstructor* ctor = findShapeConstructor( path.getFullPath() );
+   TSShapeConstructor* ctor = findShapeConstructorByFilename(path.getFullPath());
    if (ctor && (ctor->getShape() == shape))
       ctor->_onUnload();
 }
@@ -141,8 +147,11 @@ static void SplitSequencePathAndName( String& srcPath, String& srcName )
 IMPLEMENT_CONOBJECT(TSShapeConstructor);
 
 TSShapeConstructor::TSShapeConstructor()
- : mShapePath(StringTable->EmptyString()), mLoadingShape(false)
+   : mLoadingShape(false)
 {
+   mShapeAssetId = StringTable->EmptyString();
+   mShapeAsset = StringTable->EmptyString();
+
    mOptions.upAxis = UPAXISTYPE_COUNT;
    mOptions.unit = -1.0f;
    mOptions.lodType = ColladaUtils::ImportOptions::TrailingNumber;
@@ -186,7 +195,7 @@ bool TSShapeConstructor::addSequenceFromField( void *obj, const char *index, con
    TSShapeConstructor* pObj = static_cast<TSShapeConstructor*>(obj);
 
    if (data && data[0])
-      pObj->mSequences.push_back( StringTable->insert(data) );
+      pObj->mSequenceAssetIds.push_back(StringTable->insert(data));
 
    return false;
 }
@@ -194,7 +203,7 @@ bool TSShapeConstructor::addSequenceFromField( void *obj, const char *index, con
 void TSShapeConstructor::initPersistFields()
 {
    addGroup("Media");
-   addField( "baseShape", TypeStringFilename, Offset(mShapePath, TSShapeConstructor),
+   addField("baseShapeAsset", TypeShapeAssetId, Offset(mShapeAssetId, TSShapeConstructor),
       "Specifies the path to the DTS or DAE file to be operated on by this object.\n"
       "Since the TSShapeConstructor script must be in the same folder as the DTS or "
       "DAE file, it is recommended to use a relative path so that the shape and "
@@ -381,7 +390,7 @@ void TSShapeConstructor::consoleInit()
       "@ingroup MeshFit\n");
 }
 
-TSShapeConstructor* TSShapeConstructor::findShapeConstructor(const FileName& path)
+TSShapeConstructor* TSShapeConstructor::findShapeConstructorByAssetId(StringTableEntry shapeAssetId)
 {
    SimGroup* group;
    if (Sim::findObject("TSShapeConstructorGroup", group))
@@ -390,7 +399,25 @@ TSShapeConstructor* TSShapeConstructor::findShapeConstructor(const FileName& pat
       for (S32 i = 0; i < group->size(); i++)
       {
          TSShapeConstructor* tss = dynamic_cast<TSShapeConstructor*>(group->at(i));
-         FileName shapePath = tss->mShapePath;
+         StringTableEntry targetAssetId = tss->getShapeAssetId();
+
+         if(targetAssetId == shapeAssetId)
+            return tss;
+      }
+   }
+   return NULL;
+}
+
+TSShapeConstructor* TSShapeConstructor::findShapeConstructorByFilename(const FileName& path)
+{
+   SimGroup* group;
+   if (Sim::findObject("TSShapeConstructorGroup", group))
+   {
+      // Find the TSShapeConstructor object for the given shape file
+      for (S32 i = 0; i < group->size(); i++)
+      {
+         TSShapeConstructor* tss = dynamic_cast<TSShapeConstructor*>(group->at(i));
+         FileName shapePath = tss->getShapePath();
 
          char buf[1024];
          FileName fullShapePath = String(Platform::makeFullPathName(shapePath, buf, sizeof(buf)));
@@ -408,12 +435,11 @@ bool TSShapeConstructor::onAdd()
       return false;
 
    // Prevent multiple objects pointing at the same shape file
-   FileName path = mShapePath;
+   TSShapeConstructor* tss = findShapeConstructorByAssetId(getShapeAssetId());
-   TSShapeConstructor* tss = findShapeConstructor( path );
    if (tss)
    {
       Con::errorf("TSShapeConstructor::onAdd failed: %s is already referenced by "
-         "another TSShapeConstructor object (%s - %d)", mShapePath,
+         "another TSShapeConstructor object (%s - %d)", getShapeAssetId(),
          tss->getName(), tss->getId());
       return false;
    }
@@ -439,7 +465,7 @@ bool TSShapeConstructor::onAdd()
    //
    // If we have no sequences, it may be using the older sequence# syntax.
    // Check for dynamic fields of that pattern and add them into the sequence vector.
-   if ( mSequences.empty() )
+   /*if (mSequenceAssetIds.empty())
    {
       for ( U32 idx = 0; idx < MaxLegacySequences; idx++ )
       {
@@ -457,13 +483,17 @@ bool TSShapeConstructor::onAdd()
          Con::setData( TypeStringFilename, &expanded, 0, 1, &data );
          addSequenceFromField( this, NULL, expanded.c_str() );
       }
-   }
+   }*/
 
    // If an instance of this shape has already been loaded, call onLoad now
-   Resource<TSShape> shape = ResourceManager::get().find( mShapePath );
+   mShapeAsset = mShapeAssetId;
+   if (mShapeAsset.notNull())
+   {
+      Resource<TSShape> shape = mShapeAsset->getShapeResource();
 
       if (shape)
          _onLoad(shape);
+   }
 
    if (mShape && mShape->needsReinit())
    {
@@ -482,7 +512,7 @@ void TSShapeConstructor::_onLoad(TSShape* shape)
       _onUnload();
 
 #ifdef DEBUG_SPEW
-   Con::printf( "[TSShapeConstructor] attaching to shape '%s'", mShapePath );
+   Con::printf("[TSShapeConstructor] attaching to shape '%s'", getShapePath());
 #endif
 
    mShape = shape;
@@ -490,14 +520,19 @@ void TSShapeConstructor::_onLoad(TSShape* shape)
    mLoadingShape = true;
 
    // Add sequences defined using field syntax
-   for ( S32 i = 0; i < mSequences.size(); i++ )
+   for (S32 i = 0; i < mSequenceAssetIds.size(); i++)
    {
-      if ( mSequences[i] == StringTable->EmptyString())
+      if (mSequenceAssetIds[i] == StringTable->EmptyString())
+         continue;
+
+      AssetPtr<ShapeAnimationAsset> sequenceAsset = mSequenceAssetIds[i];
+
+      if (sequenceAsset.isNull())
          continue;
 
       // Split the sequence path from the target sequence name
       String destName;
-      String srcPath( mSequences[i] );
+      String srcPath(sequenceAsset->getAnimationPath());
       SplitSequencePathAndName(srcPath, destName);
 
       addSequence(srcPath, destName);
@@ -513,7 +548,7 @@ void TSShapeConstructor::_onLoad(TSShape* shape)
 void TSShapeConstructor::_onUnload()
 {
 #ifdef DEBUG_SPEW
-   Con::printf( "[TSShapeConstructor] detaching from '%s'", mShapePath );
+   Con::printf("[TSShapeConstructor] detaching from '%s'", getShapePath());
 #endif
 
    onUnload_callback();
@@ -714,7 +749,7 @@ DefineTSShapeConstructorMethod( writeChangeSet, void, (),,
    "name of the script file is the same as the model, but with ." TORQUE_SCRIPT_EXTENSION " extension. "
    "eg. myShape." TORQUE_SCRIPT_EXTENSION " for myShape.dts or myShape.dae.\n")
 {
-   Torque::Path scriptPath( mShapePath );
+   Torque::Path scriptPath(getShapePath());
    scriptPath.setExtension(TORQUE_SCRIPT_EXTENSION);
 
    // Read current file contents
@@ -777,7 +812,7 @@ DefineTSShapeConstructorMethod( notifyShapeChanged, void, (),,
    "Notify game objects that this shape file has changed, allowing them to update "
    "internal data if needed.")
 {
-   ResourceManager::get().getChangedSignal().trigger( mShapePath );
+   ResourceManager::get().getChangedSignal().trigger(getShapePath());
 }}
 
 //-----------------------------------------------------------------------------
@@ -2082,6 +2117,24 @@ DefineTSShapeConstructorMethod( addSequence, bool,
    String srcPath(source);
    SplitSequencePathAndName(srcPath, srcName);
 
+   if (AssetDatabase.isDeclaredAsset(srcPath))
+   {
+      StringTableEntry assetId = StringTable->insert(srcPath.c_str());
+      StringTableEntry assetType = AssetDatabase.getAssetType(assetId);
+      if (assetType == StringTable->insert("ShapeAsset"))
+      {
+         ShapeAsset* asset = AssetDatabase.acquireAsset<ShapeAsset>(assetId);
+         srcPath = asset->getShapeFilePath();
+         AssetDatabase.releaseAsset(assetId);
+      }
+      else if (assetType == StringTable->insert("ShapeAnimationAsset"))
+      {
+         ShapeAnimationAsset* asset = AssetDatabase.acquireAsset<ShapeAnimationAsset>(assetId);
+         srcPath = asset->getAnimationPath();
+         AssetDatabase.releaseAsset(assetId);
+      }
+   }
+
    if (!mShape->addSequence(srcPath, srcName, name, start, end, padRot, padTrans))
       return false;
 
@@ -2181,6 +2234,35 @@ DefineTSShapeConstructorMethod( removeTrigger, bool, ( const char* name, S32 key
    return true;
 }}
 
+DefineEngineFunction(findShapeConstructorByAssetId, S32, (const char* assetId),,
+   "Attempts to find an existing TSShapeConstructor by looking up an AssetId\n"
+   "@tsexample\n"
+   "findConstructorByAssetId(\"MyModule:MyShape\");\n"
+   "@endtsexample")
+{
+   StringTableEntry assetIdSTE = StringTable->insert(assetId);
+   TSShapeConstructor* tss = TSShapeConstructor::findShapeConstructorByAssetId(assetIdSTE);
+
+   if (tss)
+      return tss->getId();
+   else
+      return 0;
+}
+
+DefineEngineFunction(findShapeConstructorByFilename, S32, (const char* filename),,
+   "Attempts to find an existing TSShapeConstructor by looking up a filename\n"
+   "@tsexample\n"
+   "findShapeConstructorByFilename(\"data/myShape.dae\");\n"
+   "@endtsexample")
+{
+   FileName flName = FileName(filename);
+   TSShapeConstructor* tss = TSShapeConstructor::findShapeConstructorByFilename(flName);
+
+   if (tss)
+      return tss->getId();
+   else
+      return 0;
+}
 
 //-----------------------------------------------------------------------------
 // Change-Set manipulation

Engine/source/ts/tsShapeConstruct.h

@@ -42,6 +42,9 @@
 #include "console/engineAPI.h"
 #endif
 
+#include "T3D/assets/ShapeAsset.h"
+#include "T3D/assets/ShapeAnimationAsset.h"
+
 /// This class allows an artist to export their animations for the model
 /// into the .dsq format.  This class in particular matches up the model
 /// with the .dsqs to create a nice animated model.
@@ -161,8 +164,12 @@ public:
    static const S32 MaxLegacySequences = 127;
 
 protected:
-   StringTableEntry          mShapePath;
+   StringTableEntry     mShapeAssetId;
-   Vector<StringTableEntry>  mSequences;
+   AssetPtr<ShapeAsset> mShapeAsset;
+
+   Vector<StringTableEntry>  mSequenceAssetIds;
+   Vector<AssetPtr<ShapeAnimationAsset>> mSequencesAssets;
+
    ChangeSet         mChangeSet;
 
    // Paths to shapes used by MeshFit
@@ -196,13 +203,14 @@ public:
 public:
 
    TSShapeConstructor();
-   TSShapeConstructor(StringTableEntry path) : mShapePath(path), mShape(NULL), mLoadingShape(false){ }
+   TSShapeConstructor(StringTableEntry path) : mShapeAssetId(path), mShape(NULL), mLoadingShape(false) { }
    ~TSShapeConstructor();
 
    DECLARE_CONOBJECT(TSShapeConstructor);
    static void initPersistFields();
    static void consoleInit();
-   static TSShapeConstructor* findShapeConstructor(const FileName& path);
+   static TSShapeConstructor* findShapeConstructorByAssetId(StringTableEntry path);
+   static TSShapeConstructor* findShapeConstructorByFilename(const FileName& path);
 
    bool onAdd();
 
@@ -222,7 +230,18 @@ public:
    ///@}
 
    TSShape* getShape() const { return mShape; }
-   StringTableEntry getShapePath() const { return mShapePath; }
+   StringTableEntry getShapePath() const
+   {
+      if (mShapeAsset.notNull())
+         return mShapeAsset->getShapeFilePath();
+      else
+         return StringTable->EmptyString();
+   }
+
+   StringTableEntry getShapeAssetId() const
+   {
+      return mShapeAssetId;
+   }
 
    /// @name Dumping
    ///@{

Templates/BaseGame/game/core/gameObjects/shapes/camera.tscript

@@ -1,7 +1,7 @@
 
 singleton TSShapeConstructor(cameradts)
 {
-   baseShape = "./camera.dts";
+   baseShapeAsset = "Core_GameObjects:Camera";
    singleDetailSize = "0";
    flipUVCoords = "0";
    JoinIdenticalVerts = "0";

Templates/BaseGame/game/core/gameObjects/shapes/noshape.tscript

@@ -1,7 +1,7 @@
 
 singleton TSShapeConstructor(noshapedts)
 {
-   baseShape = "./noshape.dts";
+   baseShapeAsset = "Core_GameObjects:noshape";
    singleDetailSize = "0";
    flipUVCoords = "0";
    JoinIdenticalVerts = "0";

Templates/BaseGame/game/core/gameObjects/shapes/octahedron.tscript

@@ -1,7 +1,7 @@
 
 singleton TSShapeConstructor(octahedrondts)
 {
-   baseShape = "./octahedron.dts";
+   baseShapeAsset = "Core_GameObjects:octahedron";
    singleDetailSize = "0";
    flipUVCoords = "0";
    JoinIdenticalVerts = "0";

Templates/BaseGame/game/core/gameObjects/shapes/simplecone.tscript

@@ -1,7 +1,7 @@
 
 singleton TSShapeConstructor(simpleconedts)
 {
-   baseShape = "./simplecone.dts";
+   baseShapeAsset = "Core_GameObjects:simplecone";
    singleDetailSize = "0";
    flipUVCoords = "0";
    JoinIdenticalVerts = "0";

Templates/BaseGame/game/core/gameObjects/shapes/unit_capsule.tscript

@@ -1,7 +1,7 @@
 
 singleton TSShapeConstructor(unit_capsuledts)
 {
-   baseShape = "./unit_capsule.dts";
+   baseShapeAsset = "Core_GameObjects:unit_capsule";
    singleDetailSize = "0";
    flipUVCoords = "0";
    JoinIdenticalVerts = "0";

Templates/BaseGame/game/core/gameObjects/shapes/unit_cube.tscript

@@ -1,7 +1,7 @@
 
 singleton TSShapeConstructor(unit_cubedts)
 {
-   baseShape = "./unit_cube.dts";
+   baseShapeAsset = "Core_GameObjects:unit_cube";
    singleDetailSize = "0";
    flipUVCoords = "0";
    JoinIdenticalVerts = "0";

Templates/BaseGame/game/core/gameObjects/shapes/unit_sphere.tscript

@@ -1,7 +1,7 @@
 
 singleton TSShapeConstructor(unit_spheredts)
 {
-   baseShape = "./unit_sphere.dts";
+   baseShapeAsset = "Core_GameObjects:unit_sphere";
    singleDetailSize = "0";
    flipUVCoords = "0";
    JoinIdenticalVerts = "0";

Templates/BaseGame/game/core/gui/scripts/profiles.tscript

@@ -63,7 +63,7 @@ new GuiControlProfile (GuiDefaultProfile)
    fontColorSEL= "255 255 255";
 
    // bitmap information
-   bitmap = "";
+   bitmapAsset = "";
    bitmapBase = "";
    textOffset = "0 0";
 

Templates/BaseGame/game/core/rendering/scripts/gfxData/UnderwaterBasicMat.asset.taml

@@ -0,0 +1,7 @@
+<MaterialAsset
+    canSave="true"
+    canSaveDynamicFields="true"
+    AssetName="UnderwaterBasicMat"
+    scriptFile="@assetFile=water.tscript"
+    materialDefinitionName="UnderwaterBasicMat"
+    VersionId="1" />

Templates/BaseGame/game/core/rendering/scripts/gfxData/UnderwaterMat.asset.taml

@@ -0,0 +1,7 @@
+<MaterialAsset
+    canSave="true"
+    canSaveDynamicFields="true"
+    AssetName="UnderwaterMat"
+    scriptFile="@assetFile=water.tscript"
+    materialDefinitionName="UnderwaterMat"
+    VersionId="1" />

Templates/BaseGame/game/core/rendering/scripts/gfxData/WaterBasicMat.asset.taml

@@ -0,0 +1,7 @@
+<MaterialAsset
+    canSave="true"
+    canSaveDynamicFields="true"
+    AssetName="WaterBasicMat"
+    scriptFile="@assetFile=water.tscript"
+    materialDefinitionName="WaterBasicMat"
+    VersionId="1" />

Templates/BaseGame/game/core/rendering/scripts/gfxData/WaterMat.asset.taml

@@ -0,0 +1,7 @@
+<MaterialAsset
+    canSave="true"
+    canSaveDynamicFields="true"
+    AssetName="WaterMat"
+    scriptFile="@assetFile=water.tscript"
+    materialDefinitionName="WaterMat"
+    VersionId="1" />

Templates/BaseGame/game/core/rendering/shapes/Fog_Cube.tscript

@@ -1,7 +1,7 @@
 
 singleton TSShapeConstructor(Fog_CubeDAE)
 {
-   baseShape = "./Fog_Cube.DAE";
+   baseShapeAsset = "Core_Rendering:Fog_Cube";
    singleDetailSize = "0";
    flipUVCoords = "0";
    JoinIdenticalVerts = "0";

Templates/BaseGame/game/data/Prototyping/shapes/ConePrimitive.tscript

@@ -1,6 +1,6 @@
 //--- OBJECT WRITE BEGIN ---
 new TSShapeConstructor(ConePrimitive_fbx) {
-   baseShape = "./ConePrimitive.fbx";
+   baseShapeAsset = "Prototyping:ConePrimitive";
    upAxis = "DEFAULT";
    unit = "-1";
    LODType = "TrailingNumber";

Templates/BaseGame/game/data/Prototyping/shapes/CubePrimitive.tscript

@@ -1,6 +1,6 @@
 //--- OBJECT WRITE BEGIN ---
 new TSShapeConstructor(CubePrimitive_fbx) {
-   baseShape = "./CubePrimitive.fbx";
+   baseShapeAsset = "Prototyping:CubePrimitive";
    upAxis = "DEFAULT";
    unit = "-1";
    LODType = "TrailingNumber";

Templates/BaseGame/game/data/Prototyping/shapes/CylinderPrimitive.tscript

@@ -1,6 +1,6 @@
 //--- OBJECT WRITE BEGIN ---
 new TSShapeConstructor(CylinderPrimitive_fbx) {
-   baseShape = "./CylinderPrimitive.fbx";
+   baseShapeAsset = "Prototyping:CylinderPrimitive";
    upAxis = "DEFAULT";
    unit = "-1";
    LODType = "TrailingNumber";

Templates/BaseGame/game/data/Prototyping/shapes/SpherePrimitive.tscript

@@ -1,6 +1,6 @@
 //--- OBJECT WRITE BEGIN ---
 new TSShapeConstructor(SpherePrimitive_fbx) {
-   baseShape = "./SpherePrimitive.fbx";
+   baseShapeAsset = "Prototyping:SpherePrimitive";
    upAxis = "DEFAULT";
    unit = "-1";
    LODType = "TrailingNumber";

Templates/BaseGame/game/data/Prototyping/shapes/TorusPrimitive.tscript

@@ -1,6 +1,6 @@
 //--- OBJECT WRITE BEGIN ---
 new TSShapeConstructor(TorusPrimitive_fbx) {
-   baseShape = "./TorusPrimitive.fbx";
+   baseShapeAsset = "Prototyping:TorusPrimitive";
    upAxis = "DEFAULT";
    unit = "-1";
    LODType = "TrailingNumber";

Templates/BaseGame/game/data/Prototyping/shapes/TubePrimitive.tscript

@@ -1,6 +1,6 @@
 //--- OBJECT WRITE BEGIN ---
 new TSShapeConstructor(TubePrimitive_fbx) {
-   baseShape = "./TubePrimitive.fbx";
+   baseShapeAsset = "Prototyping:TubePrimitive";
    upAxis = "DEFAULT";
    unit = "-1";
    LODType = "TrailingNumber";

Templates/BaseGame/game/data/Prototyping/shapes/kork_chanShape.tscript

@@ -1,6 +1,6 @@
 //--- OBJECT WRITE BEGIN ---
 new TSShapeConstructor(kork_chanShape_fbx) {
-   baseShape = "./kork_chanShape.fbx";
+   baseShapeAsset = "Prototyping:kork_chanShape";
    upAxis = "DEFAULT";
    unit = "-1";
    LODType = "TrailingNumber";

Templates/BaseGame/game/data/ui/guis/startupGui.gui

@@ -13,7 +13,7 @@
    Visible = "1";
    tooltipprofile = "GuiToolTipProfile";
    hovertime = "1000";
-   bitmap = "";
+   bitmapAsset = "";
    wrap = "0";
    fadeinTime = "1000";
    waitTime = "4000";
@@ -70,7 +70,7 @@ new GuiFadeinBitmapCtrl(BlankGui) {
    minExtent = "8 8";
    visible = "1";
    helpTag = "0";
-   bitmap = "";
+   bitmapAsset = "";
    wrap = "0";
    fadeinTime = "100";
    waitTime   = "2000";

Templates/BaseGame/game/tools/VPathEditor/GUI/Images/Images_btn_Palette_d_image.asset.taml

@@ -0,0 +1,8 @@
+<ImageAsset
+    canSave="true"
+    canSaveDynamicFields="true"
+    AssetName="Images_btn_Palette_d_image"
+    imageFile="@assetFile=btn_Palette_d.png"
+    UseMips="true"
+    isHDRImage="false"
+    imageType="Albedo" />

Templates/BaseGame/game/tools/VPathEditor/GUI/Images/Images_btn_Palette_h_image.asset.taml

@@ -0,0 +1,8 @@
+<ImageAsset
+    canSave="true"
+    canSaveDynamicFields="true"
+    AssetName="Images_btn_Palette_h_image"
+    imageFile="@assetFile=btn_Palette_h.png"
+    UseMips="true"
+    isHDRImage="false"
+    imageType="Albedo" />

Templates/BaseGame/game/tools/VPathEditor/GUI/Images/Images_btn_Palette_n_image.asset.taml

@@ -0,0 +1,8 @@
+<ImageAsset
+    canSave="true"
+    canSaveDynamicFields="true"
+    AssetName="Images_btn_Palette_n_image"
+    imageFile="@assetFile=btn_Palette_n.png"
+    UseMips="true"
+    isHDRImage="false"
+    imageType="Albedo" />

Templates/BaseGame/game/tools/VPathEditor/GUI/VPathEditor.gui

@@ -141,7 +141,7 @@ new VPathEditor(EVPathEditor) {
          };
       };
       new GuiBitmapButtonCtrl() {
-         bitmap = "tools/gui/images/delete";
+         bitmapAsset = "ToolsModule:delete_n_image";
          groupNum = "-1";
          buttonType = "PushButton";
          useMouseEvents = "0";

Templates/BaseGame/game/tools/VPathEditor/GUI/VPathEditorPalette.gui

@@ -33,7 +33,7 @@
       tooltipprofile = "GuiToolTipProfile";
       ToolTip = "Select Path / Node (1)";
       hovertime = "1000";
-      bitmap = "tools/gui/images/menubar/arrow";
+      bitmapAsset = "ToolsModule:arrow_n_image";
       buttonType = "RadioButton";
       useMouseEvents = "0";
    };
@@ -53,7 +53,7 @@
       tooltipprofile = "GuiToolTipProfile";
       ToolTip = "Move Point (2)";
       hovertime = "1000";
-      bitmap = "tools/worldEditor/images/road-river/move-point";
+      bitmapAsset = "ToolsModule:move_point_n_image";
       buttonType = "RadioButton";
       useMouseEvents = "0";
    };
@@ -73,7 +73,7 @@
       tooltipprofile = "GuiToolTipProfile";
       ToolTip = "Rotate Point (3)";
       hovertime = "1000";
-      bitmap = "tools/worldEditor/images/road-river/rotate-point";
+      bitmapAsset = "ToolsModule:rotate_point_n_image";
       buttonType = "RadioButton";
       useMouseEvents = "0";
    };
@@ -93,7 +93,7 @@
       tooltipprofile = "GuiToolTipProfile";
       ToolTip = "Scale Point (4)";
       hovertime = "1000";
-      bitmap = "tools/worldEditor/images/road-river/scale-point";
+      bitmapAsset = "ToolsModule:scale_point_n_image";
       buttonType = "RadioButton";
       useMouseEvents = "0";
    };
@@ -113,7 +113,7 @@
       tooltipprofile = "GuiToolTipProfile";
       ToolTip = "Add Node (5)";
       hovertime = "1000";
-      bitmap = "tools/worldEditor/images/road-river/add-point";
+      bitmapAsset = "ToolsModule:add_point_n_image";
       buttonType = "RadioButton";
       useMouseEvents = "0";
    };
@@ -133,7 +133,7 @@
       tooltipprofile = "GuiToolTipProfile";
       ToolTip = "Delete Node (6)";
       hovertime = "1000";
-      bitmap = "tools/worldEditor/images/road-river/subtract-point";
+      bitmapAsset = "ToolsModule:subtract_point_n_image";
       buttonType = "RadioButton";
       useMouseEvents = "0";
    };

Templates/BaseGame/game/tools/VPathEditor/Scripts/Plugin.tscript

@@ -40,7 +40,7 @@ function VPathEditorPlugin::onWorldEditorStartup( %this )
 
     // Add ourselves to the ToolsToolbar
     %tooltip = "Path Editor (" @ %accel @ ")";
-    EditorGui.addToToolsToolbar( "VPathEditorPlugin", "VPathEditorPalette", expandFilename( "tools/VPathEditor/GUI/Images/btn_Palette" ), %tooltip );
+    EditorGui.addToToolsToolbar( "VPathEditorPlugin", "VPathEditorPalette", "ToolsModule:btn_Palette_n_image", %tooltip );
 
     // Find and Store the Button.
     %this.ToolbarButton = ToolsToolbarArray.findObjectByInternalName( "VPathEditorPalette", false );

Templates/BaseGame/game/tools/VerveEditor/GUI/GuiProfiles.tscript

@@ -170,7 +170,7 @@ singleton GuiControlProfile ( VEditorScrollProfile : VEditorDefaultProfile )
     border = false;
     
     hasBitmapArray = true;
-    bitmap         = "./Images/ScrollBar";
+    bitmapAsset         = "ToolsModule:Images_ScrollBar_image";
 };
 
 singleton GuiControlProfile ( VEditorCheckBoxProfile : GuiCheckBoxProfile )

Templates/BaseGame/game/tools/VerveEditor/GUI/Images/Images_ScrollBar_image.asset.taml

@@ -0,0 +1,8 @@
+<ImageAsset
+    canSave="true"
+    canSaveDynamicFields="true"
+    AssetName="Images_ScrollBar_image"
+    imageFile="@assetFile=scrollBar.png"
+    UseMips="true"
+    isHDRImage="false"
+    imageType="Albedo" />

Templates/BaseGame/game/tools/VerveEditor/GUI/VerveEditor.gui

@@ -307,7 +307,7 @@
                 groupNum = "-1";
                 buttonType = "PushButton";
                 useMouseEvents = "0";
-                bitmap = "./Images/btn_AddGroup";
+                bitmapAsset = "ToolsModule:btn_AddGroup_image";
              };
              new GuiBitmapButtonCtrl(VerveEditorAddTrackButton) {
                 canSaveDynamicFields = "0";
@@ -330,7 +330,7 @@
                 groupNum = "-1";
                 buttonType = "PushButton";
                 useMouseEvents = "0";
-                bitmap = "./Images/btn_AddTrack";
+                bitmapAsset = "ToolsModule:btn_AddTrack_image";
              };
              new GuiBitmapButtonCtrl(VerveEditorAddEventButton) {
                 canSaveDynamicFields = "0";
@@ -352,7 +352,7 @@
                 groupNum = "-1";
                 buttonType = "PushButton";
                 useMouseEvents = "0";
-                bitmap = "./Images/btn_AddEvent";
+                bitmapAsset = "ToolsModule:btn_AddEvent_image";
              };
              new GuiBitmapButtonCtrl() {
                 canSaveDynamicFields = "0";
@@ -374,7 +374,7 @@
                 groupNum = "-1";
                 buttonType = "PushButton";
                 useMouseEvents = "0";
-                bitmap = "./Images/btn_Delete";
+                bitmapAsset = "ToolsModule:btn_Delete_image";
              };
          };
       };
@@ -623,7 +623,7 @@
                groupNum = "-1";
                buttonType = "PushButton";
                useMouseEvents = "0";
-               bitmap = "./Images/btn_Rewind";
+               bitmapAsset = "ToolsModule:btn_Rewind_image";
             };
             new GuiBitmapButtonCtrl() {
                canSaveDynamicFields = "0";
@@ -645,7 +645,7 @@
                groupNum = "-1";
                buttonType = "PushButton";
                useMouseEvents = "0";
-               bitmap = "./Images/btn_StepB";
+               bitmapAsset = "ToolsModule:btn_StepB_image";
             };
             new GuiBitmapButtonCtrl(VerveEditorPlayButton) {
                canSaveDynamicFields = "0";
@@ -667,7 +667,7 @@
                groupNum = "-1";
                buttonType = "PushButton";
                useMouseEvents = "0";
-               bitmap = "./Images/btn_Play";
+               bitmapAsset = "ToolsModule:btn_Play_image";
             };
             new GuiBitmapButtonCtrl() {
                canSaveDynamicFields = "0";
@@ -689,7 +689,7 @@
                groupNum = "-1";
                buttonType = "PushButton";
                useMouseEvents = "0";
-               bitmap = "./Images/btn_StepF";
+               bitmapAsset = "ToolsModule:btn_StepF_image";
             };
             new GuiBitmapButtonCtrl() {
                canSaveDynamicFields = "0";
@@ -711,7 +711,7 @@
                groupNum = "-1";
                buttonType = "PushButton";
                useMouseEvents = "0";
-               bitmap = "./Images/btn_Forward";
+               bitmapAsset = "ToolsModule:btn_Forward_image";
             };
          };
          new GuiBitmapButtonCtrl() {
@@ -734,7 +734,7 @@
             groupNum = "-1";
             buttonType = "PushButton";
             useMouseEvents = "0";
-            bitmap = "./Images/btn_AddL";
+            bitmapAsset = "ToolsModule:btn_AddL_image";
          };
          new GuiBitmapButtonCtrl() {
             canSaveDynamicFields = "0";
@@ -756,7 +756,7 @@
             groupNum = "-1";
             buttonType = "PushButton";
             useMouseEvents = "0";
-            bitmap = "./Images/btn_AddR";
+            bitmapAsset = "ToolsModule:btn_AddR_image";
          };
       };
    };

Templates/BaseGame/game/tools/VerveEditor/Scripts/Plugin.tscript

@@ -26,7 +26,7 @@ function VerveEditorPlugin::onWorldEditorStartup( %this )
     %tooltip = "Verve Editor (" @ %accel @ ")";
    
     // Add ourselves to the ToolsToolbar
-    EditorGui.addToToolsToolbar( "VerveEditorPlugin", "VerveEditorPluginPalette", expandFilename( "tools/VerveEditor/GUI/Images/btn_Palette" ), %tooltip );
+    EditorGui.addToToolsToolbar( "VerveEditorPlugin", "VerveEditorPluginPalette", "ToolsModule:btn_Palette_n_image", %tooltip );
 
     // Find and Store the Button.
     %this.ToolbarButton = ToolsToolbarArray.findObjectByInternalName( "VerveEditorPluginPalette", false );

Templates/BaseGame/game/tools/assetBrowser/assetImportConfigs.xml

@@ -187,7 +187,7 @@
             <Setting
                 name="AutomaticallyPromptMissingFiles">0</Setting>
             <Setting
-                name="DuplicatAutoResolution">AutoPrune</Setting>
+                name="DuplicateAutoResolution">FolderPrefix</Setting>
             <Setting
                 name="PreventImportWithErrors">1</Setting>
             <Setting

Templates/BaseGame/game/tools/assetBrowser/guis/assetBrowser.gui

@@ -469,7 +469,7 @@
                   command="AssetBrowserFolderSearchFilter.onEdited();";
                };
                new GuiBitmapButtonCtrl() {
-                  bitmap = "tools/gui/images/stencilIcons/zoom.png";
+                  bitmapAsset = "ToolsModule:zoom_image";
                   bitmapMode = "Stretched";
                   autoFitExtents = "0";
                   useModifiers = "0";
@@ -631,7 +631,7 @@
                canSaveDynamicFields = "0";
 
                new GuiBitmapButtonCtrl(AssetBrowser_NavigateBackBtn) {
-                  bitmap = "tools/gui/images/folderUp.png";
+                  bitmapAsset = "ToolsModule:folderUp_image";
                   bitmapMode = "Centered";
                   autoFitExtents = "0";
                   useModifiers = "0";
@@ -657,7 +657,7 @@
                   canSaveDynamicFields = "0";
                };
                new GuiBitmapButtonCtrl(AssetBrowser_NavigateForwardBtn) {
-                  bitmap = "tools/gui/images/folderDown.png";
+                  bitmapAsset = "ToolsModule:folderDown_image";
                   bitmapMode = "Centered";
                   autoFitExtents = "0";
                   useModifiers = "0";
@@ -758,7 +758,7 @@
                canSaveDynamicFields = "0";
 
                new GuiBitmapButtonCtrl(AssetBrowser_VisibilityOptions) {
-                  bitmap = "tools/gui/images/visible";
+                  bitmapAsset = "ToolsModule:visible_n_image";
                   bitmapMode = "Centered";
                   autoFitExtents = "0";
                   useModifiers = "0";
@@ -814,7 +814,7 @@
                   command="AssetBrowserSearchFilter.onEdited();";
                };
                new GuiBitmapButtonCtrl() {
-                  bitmap = "tools/gui/images/stencilIcons/zoom.png";
+                  bitmapAsset = "ToolsModule:zoom_image";
                   bitmapMode = "Stretched";
                   autoFitExtents = "0";
                   useModifiers = "0";
@@ -840,7 +840,7 @@
                   canSaveDynamicFields = "0";
                };
                new GuiBitmapButtonCtrl() {
-                  bitmap = "tools/gui/images/save-icon";
+                  bitmapAsset = "ToolsModule:save_icon_n_image";
                   bitmapMode = "Stretched";
                   autoFitExtents = "0";
                   useModifiers = "0";
@@ -1034,7 +1034,7 @@
                   canSaveDynamicFields = "0";
                };
                new GuiBitmapButtonCtrl(AssetBrowser_ToggleFolderPanel) {
-                  bitmap = "tools/gui/images/stencilIcons/previous.png";
+                  bitmapAsset = "ToolsModule:previous_image";
                   bitmapMode = "Stretched";
                   autoFitExtents = "0";
                   useModifiers = "0";

Templates/BaseGame/game/tools/assetBrowser/guis/assetImport.gui

@@ -95,7 +95,7 @@
          canSaveDynamicFields = "0";
       };
       new GuiBitmapButtonCtrl() {
-         bitmap = "tools/gui/images/iconOpen.png";
+         bitmapAsset = "ToolsModule:iconOpen_image";
          bitmapMode = "Centered";
          autoFitExtents = "0";
          useModifiers = "0";
@@ -221,7 +221,7 @@
          canSaveDynamicFields = "0";
       };
       new GuiBitmapButtonCtrl() {
-         bitmap = "tools/gui/images/save-as";
+         bitmapAsset = "ToolsModule:save_as_n_image";
          bitmapMode = "Centered";
          autoFitExtents = "0";
          useModifiers = "0";
@@ -504,7 +504,7 @@
          canSaveDynamicFields = "0";
       };
       new GuiBitmapButtonCtrl(ImportLogButton) {
-         bitmap = "tools/gui/images/iconInformation.png";
+         bitmapAsset = "ToolsModule:iconInformation_image";
          bitmapMode = "Centered";
          autoFitExtents = "0";
          useModifiers = "0";

Templates/BaseGame/game/tools/assetBrowser/guis/assetImportConfigEditor.gui

@@ -198,7 +198,7 @@
             canSaveDynamicFields = "0";
 
             new GuiBitmapButtonCtrl() {
-               bitmap = "tools/gui/images/iconAdd.png";
+               bitmapAsset = "ToolsModule:iconAdd_image";
                bitmapMode = "Centered";
                autoFitExtents = "0";
                useModifiers = "0";
@@ -225,7 +225,7 @@
                canSaveDynamicFields = "0";
             };
             new GuiBitmapButtonCtrl() {
-               bitmap = "tools/gui/images/iconDelete.png";
+               bitmapAsset = "ToolsModule:iconDelete_image";
                bitmapMode = "Centered";
                autoFitExtents = "0";
                useModifiers = "0";

Templates/BaseGame/game/tools/assetBrowser/guis/gameObjectCreator.gui

@@ -132,7 +132,7 @@
          canSaveDynamicFields = "0";
       };
       new GuiBitmapButtonCtrl(GameObjectCreatorPkgBtn) {
-         bitmap = "tools/gui/images/iconAdd.png";
+         bitmapAsset = "ToolsModule:iconAdd_image";
          bitmapMode = "Centered";
          autoFitExtents = "0";
          useModifiers = "0";

Templates/BaseGame/game/tools/assetBrowser/guis/newAsset.gui

@@ -119,7 +119,7 @@
          canSaveDynamicFields = "0";
       };
       new GuiBitmapButtonCtrl() {
-         bitmap = "tools/gui/images/iconOpen.png";
+         bitmapAsset = "ToolsModule:iconOpen_image";
          bitmapMode = "Centered";
          autoFitExtents = "0";
          useModifiers = "0";

Templates/BaseGame/game/tools/assetBrowser/guis/newComponentAsset.gui

@@ -98,7 +98,7 @@
          canSaveDynamicFields = "0";
       };
       new GuiBitmapButtonCtrl() {
-         bitmap = "tools/gui/images/iconAdd.png";
+         bitmapAsset = "ToolsModule:iconAdd_image";
          bitmapMode = "Centered";
          autoFitExtents = "0";
          useModifiers = "0";

Templates/BaseGame/game/tools/assetBrowser/guis/selectModule.gui

@@ -75,7 +75,7 @@
          canSaveDynamicFields = "0";
       };
       new GuiBitmapButtonCtrl() {
-         bitmap = "tools/gui/images/iconAdd.png";
+         bitmapAsset = "ToolsModule:iconAdd_image";
          bitmapMode = "Centered";
          autoFitExtents = "0";
          useModifiers = "0";

Templates/BaseGame/game/tools/assetBrowser/guis/selectPackage.gui

@@ -75,7 +75,7 @@
          canSaveDynamicFields = "0";
       };
       new GuiBitmapButtonCtrl() {
-         bitmap = "tools/gui/images/iconAdd.png";
+         bitmapAsset = "ToolsModule:iconAdd_image";
          bitmapMode = "Centered";
          autoFitExtents = "0";
          useModifiers = "0";

Templates/BaseGame/game/tools/assetBrowser/guis/selectPath.gui

@@ -96,7 +96,7 @@
             canSaveDynamicFields = "0";
          };
          new GuiBitmapButtonCtrl() {
-            bitmap = "tools/gui/images/clear-icon";
+            bitmapAsset = "ToolsModule:clear_icon_n_image";
             bitmapMode = "Centered";
             autoFitExtents = "0";
             useModifiers = "0";

Templates/BaseGame/game/tools/assetBrowser/scripts/assetBrowser.tscript

@@ -3,7 +3,6 @@ new SimGroup(AssetBrowserPreviewCache);
 //AssetBrowser.addToolbarButton
 function AssetBrowser::addToolbarButton(%this)
 {
-	%filename = expandFilename("tools/gui/images/stencilIcons/menuGrid");
 	%button = new GuiBitmapButtonCtrl() {
 		canSaveDynamicFields = "0";
 		internalName = AssetBrowserBtn;
@@ -21,7 +20,7 @@ function AssetBrowser::addToolbarButton(%this)
 		tooltipprofile = "ToolsGuiToolTipProfile";
 		ToolTip = "Asset Browser";
 		hovertime = "750";
-		bitmap = %filename;
+		bitmapAsset = "ToolsModule:menuGrid_n_image";
 		bitmapMode = "Stretched";
 		buttonType = "PushButton";
 		groupNum = "0";
@@ -2142,7 +2141,7 @@ function AssetBrowser::updateNavigationBreadcrumb(%this, %address)
          %folderSpacerButton = new GuiBitmapButtonCtrl()
          {
             profile = ToolsGuiButtonProfile;
-            bitmap = "tools/gui/images/rightArrowWhite";
+            bitmapAsset = "ToolsModule:rightArrowWhite_image";
             bitmapMode = "Centered";
             extent = "25" SPC AssetBrowser_BreadcrumbBar.extent.y;
             //command = "AssetBrowser.navigateTo(\"" @ %rebuiltPath @ "\");";

Templates/BaseGame/game/tools/assetBrowser/scripts/assetImportConfig.tscript

@@ -31,7 +31,7 @@ function setupImportConfigSettingsList()
    {
       new ArrayObject(ImportAssetConfigSettingsList);
       
-      ImportAssetConfigSettingsList.addNewConfigSetting("General/DuplicatAutoResolution", "Duplicate Asset Auto-Resolution Action", "list", "", "AutoPrune", "None,AutoPrune,AutoRename");
+      ImportAssetConfigSettingsList.addNewConfigSetting("General/DuplicateAutoResolution", "Duplicate Asset Auto-Resolution Action", "list", "", "AutoRename", "None,AutoPrune,AutoRename,FolderPrefix");
       ImportAssetConfigSettingsList.addNewConfigSetting("General/WarningsAsErrors", "Warnings As Errors", "bool", "", "0", "", "");
       ImportAssetConfigSettingsList.addNewConfigSetting("General/PreventImportWithErrors", "Prevent Import With Errors", "bool", "", "1", "", "");
       ImportAssetConfigSettingsList.addNewConfigSetting("General/AutomaticallyPromptMissingFiles", "Automatically Prompt Missing Files", "bool", "", "0", "", "");

Templates/BaseGame/game/tools/assetBrowser/scripts/directoryHandling.tscript

@@ -114,7 +114,7 @@ function directoryHandler::navigateTo(%this, %address, %historyNav, %selectionNa
          %folderSpacerButton = new GuiBitmapButtonCtrl()
          {
             profile = ToolsGuiButtonProfile;
-            bitmap = "tools/gui/images/rightArrowWhite";
+            bitmapAsset = "ToolsModule:rightArrowWhite_image";
             bitmapMode = "Centered";
             extent = "25" SPC AssetBrowser_BreadcrumbBar.extent.y;
             //command = "AssetBrowser.navigateTo(\"" @ %rebuiltPath @ "\");";

Templates/BaseGame/game/tools/base/images/Grid_512_Black.asset.taml

@@ -0,0 +1,7 @@
+<MaterialAsset
+    canSave="true"
+    canSaveDynamicFields="true"
+    AssetName="Grid_512_Black"
+    scriptFile="@assetFile=materials.tscript"
+    materialDefinitionName="Grid_512_Black"
+    VersionId="1" />

Templates/BaseGame/game/tools/base/images/Grid_512_ForestGreen.asset.taml

@@ -0,0 +1,7 @@
+<MaterialAsset
+    canSave="true"
+    canSaveDynamicFields="true"
+    AssetName="Grid_512_ForestGreen"
+    scriptFile="@assetFile=materials.tscript"
+    materialDefinitionName="Grid_512_ForestGreen"
+    VersionId="1" />

Templates/BaseGame/game/tools/base/images/Grid_512_ForestGreen_Lines.asset.taml

@@ -0,0 +1,7 @@
+<MaterialAsset
+    canSave="true"
+    canSaveDynamicFields="true"
+    AssetName="Grid_512_ForestGreen_Lines"
+    scriptFile="@assetFile=materials.tscript"
+    materialDefinitionName="Grid_512_ForestGreen_Lines"
+    VersionId="1" />

Templates/BaseGame/game/tools/base/images/Grid_512_Green.asset.taml

@@ -0,0 +1,7 @@
+<MaterialAsset
+    canSave="true"
+    canSaveDynamicFields="true"
+    AssetName="Grid_512_Green"
+    scriptFile="@assetFile=materials.tscript"
+    materialDefinitionName="Grid_512_Green"
+    VersionId="1" />

Templates/BaseGame/game/tools/base/images/Grid_512_Grey.asset.taml

@@ -0,0 +1,7 @@
+<MaterialAsset
+    canSave="true"
+    canSaveDynamicFields="true"
+    AssetName="Grid_512_Grey"
+    scriptFile="@assetFile=materials.tscript"
+    materialDefinitionName="Grid_512_Grey"
+    VersionId="1" />

Templates/BaseGame/game/tools/base/images/Grid_512_Grey_Base.asset.taml

@@ -0,0 +1,7 @@
+<MaterialAsset
+    canSave="true"
+    canSaveDynamicFields="true"
+    AssetName="Grid_512_Grey_Base"
+    scriptFile="@assetFile=materials.tscript"
+    materialDefinitionName="Grid_512_Grey_Base"
+    VersionId="1" />

Templates/BaseGame/game/tools/base/images/Grid_512_Orange.asset.taml

@@ -0,0 +1,7 @@
+<MaterialAsset
+    canSave="true"
+    canSaveDynamicFields="true"
+    AssetName="Grid_512_Orange"
+    scriptFile="@assetFile=materials.tscript"
+    materialDefinitionName="Grid_512_Orange"
+    VersionId="1" />

Templates/BaseGame/game/tools/base/images/Grid_512_Orange_Lines.asset.taml

@@ -0,0 +1,7 @@
+<MaterialAsset
+    canSave="true"
+    canSaveDynamicFields="true"
+    AssetName="Grid_512_Orange_Lines"
+    scriptFile="@assetFile=materials.tscript"
+    materialDefinitionName="Grid_512_Orange_Lines"
+    VersionId="1" />

Templates/BaseGame/game/tools/base/images/Grid_512_Red.asset.taml

@@ -0,0 +1,7 @@
+<MaterialAsset
+    canSave="true"
+    canSaveDynamicFields="true"
+    AssetName="Grid_512_Red"
+    scriptFile="@assetFile=materials.tscript"
+    materialDefinitionName="Grid_512_Red"
+    VersionId="1" />

Templates/BaseGame/game/tools/componentEditor/interface/materialFieldType.tscript

@@ -66,7 +66,7 @@ function GuiInspectorGroup::buildMaterialField(%this, %fieldName, %fieldLabel, %
       position = "7 4";
       extent = "64 64";
       buttonType = "PushButton";
-      bitmap = "";
+      bitmapAsset = "";
       Command = "";
       text = "Loading...";
       useStates = false;
@@ -80,7 +80,7 @@ function GuiInspectorGroup::buildMaterialField(%this, %fieldName, %fieldLabel, %
             extent = "64 64";
             Variable = "";
             buttonType = "toggleButton";
-            bitmap = "tools/materialEditor/gui/cubemapBtnBorder";
+            bitmapAsset = "ToolsModule:cubemapBtnBorder_n_image";
             groupNum = "0";
             text = "";
 			tooltip = "Change material";

Templates/BaseGame/game/tools/convexEditor/convexEditorToolbar.ed.gui

@@ -55,7 +55,7 @@
       tooltipprofile = "ToolsGuiToolTipProfile";
       ToolTip = "Create ConvexShape Box" NL "Use Alt + Click-Drag instead of this for more control of starting placement.";
       hovertime = "1000";
-      bitmap = "tools/convexEditor/images/convex-editor-btn";
+      bitmapAsset = "ToolsModule:convex_editor_btn_n_image";
       text = "";
       groupNum = "-1";
       buttonType = "pushButton";
@@ -76,7 +76,7 @@
       tooltipprofile = "ToolsGuiToolTipProfile";
       ToolTip = "Split selected face" NL "Use Ctrl + Rotate instead for more control.";
       hovertime = "1000";
-      bitmap = "tools/convexEditor/images/split-face-btn";
+      bitmapAsset = "ToolsModule:split_face_btn_n_image";
       text = "";
       groupNum = "-1";
       buttonType = "PushButton";
@@ -97,7 +97,7 @@
       tooltipprofile = "ToolsGuiToolTipProfile";
       ToolTip = "Delete selected face" NL "(Delete)";
       hovertime = "1000";
-      bitmap = "tools/gui/images/menubar/delete-btn";
+      bitmapAsset = "ToolsModule:delete_btn_n_image";
       text = "";
       groupNum = "-1";
       buttonType = "PushButton";
@@ -145,7 +145,7 @@
          buttonType = "toggleButton";
          useMouseEvents = "0";
          groupNum = "-1";
-         bitmap = "tools/gui/images/menubar/snap-grid";
+         bitmapAsset = "ToolsModule:menubar_snap_grid_n_image";
          textMargin = "4";
       };
       new GuiTextCtrl() {

Templates/BaseGame/game/tools/convexEditor/main.tscript

@@ -68,7 +68,7 @@ function ConvexEditorPlugin::onWorldEditorStartup( %this )
    
    // Add ourselves to the ToolsToolbar
    %tooltip = "Sketch Tool (" @ %accel @ ")";
-   EditorGui.addToToolsToolbar( "ConvexEditorPlugin", "ConvexEditorPalette", expandFilename("tools/convexEditor/images/convex-editor-btn"), %tooltip );
+   EditorGui.addToToolsToolbar( "ConvexEditorPlugin", "ConvexEditorPalette", "ToolsModule:convex_editor_btn_n_image", %tooltip );
    
    //connect editor windows
    GuiWindowCtrl::attach( ConvexEditorOptionsWindow, ConvexEditorTreeWindow);

Templates/BaseGame/game/tools/datablockEditor/DatablockEditorInspectorWindow.ed.gui

@@ -166,7 +166,7 @@
          active = "0";
       };
       new GuiBitmapButtonCtrl() {
-         bitmap = "tools/gui/images/save-icon";
+         bitmapAsset = "ToolsModule:save_icon_n_image";
          groupNum = "-1";
          buttonType = "PushButton";
          useMouseEvents = "0";
@@ -186,7 +186,7 @@
          canSaveDynamicFields = "0";
       };
       new GuiBitmapButtonCtrl() {
-         bitmap = "tools/gui/images/save-as";
+         bitmapAsset = "ToolsModule:save_as_n_image";
          groupNum = "-1";
          buttonType = "PushButton";
          useMouseEvents = "0";

Templates/BaseGame/game/tools/datablockEditor/DatablockEditorTreeWindow.ed.gui

@@ -103,7 +103,7 @@
             };
             
             new GuiBitmapButtonCtrl() {
-               bitmap = "tools/gui/images/clear-icon";
+               bitmapAsset = "ToolsModule:clear_icon_n_image";
                groupNum = "-1";
                buttonType = "PushButton";
                useMouseEvents = "0";
@@ -265,7 +265,7 @@
          };
       };
       new GuiBitmapButtonCtrl() {
-         bitmap = "tools/gui/images/delete";
+         bitmapAsset = "ToolsModule:delete_n_image";
          groupNum = "-1";
          buttonType = "PushButton";
          useMouseEvents = "0";
@@ -286,7 +286,7 @@
          canSaveDynamicFields = "0";
       };
       new GuiBitmapButtonCtrl() {
-         bitmap = "tools/gui/images/new";
+         bitmapAsset = "ToolsModule:new_n_image";
          groupNum = "-1";
          buttonType = "PushButton";
          useMouseEvents = "0";

Templates/BaseGame/game/tools/datablockEditor/datablockEditor.tscript

@@ -46,7 +46,7 @@ function DatablockEditorPlugin::onWorldEditorStartup( %this )
    
    // Add ourselves to the ToolsToolbar
    %tooltip = "Datablock Editor (" @ %accel @ ")"; 
-   EditorGui.addToToolsToolbar( "DatablockEditorPlugin", "DatablockEditorPalette", expandFilename("tools/worldEditor/images/toolbar/datablock-editor"), %tooltip );
+   EditorGui.addToToolsToolbar( "DatablockEditorPlugin", "DatablockEditorPalette", "ToolsModule:datablock_editor_n_image", %tooltip );
 
    //connect editor windows
    GuiWindowCtrl::Attach( DatablockEditorInspectorWindow, DatablockEditorTreeWindow);

Templates/BaseGame/game/tools/decalEditor/decalEditorGui.gui

@@ -310,7 +310,7 @@
          tooltip = "Save All";
          buttonType = "PushButton";
          useMouseEvents = "0";
-         bitmap = "tools/gui/images/save-icon";
+         bitmapAsset = "ToolsModule:save_icon_n_image";
       };
          
       new GuiBitmapButtonCtrl(RetargetDecalButton) {
@@ -329,7 +329,7 @@
          tooltipprofile = "ToolsGuiToolTipProfile";
          hovertime = "1000";
          tooltip = "Retarget missing decals to an existing decal datablock";
-         bitmap = "tools/gui/images/retarget-btn";
+         bitmapAsset = "ToolsModule:retarget_btn_n_image";
          buttonType = "PushButton";
          useMouseEvents = "0";
       };
@@ -350,7 +350,7 @@
          tooltipprofile = "ToolsGuiToolTipProfile";
          hovertime = "1000";
          tooltip = "Create New Decal Template";
-         bitmap = "tools/gui/images/new";
+         bitmapAsset = "ToolsModule:new_n_image";
          buttonType = "PushButton";
          useMouseEvents = "0";
       };
@@ -372,7 +372,7 @@
          hovertime = "1000";
          text = "";
          tooltip = "Delete Selected Decal Template";
-         bitmap = "tools/gui/images/delete";
+         bitmapAsset = "ToolsModule:delete_n_image";
          groupNum = "-1";
          buttonType = "PushButton";
          useMouseEvents = "0";

Templates/BaseGame/game/tools/decalEditor/main.tscript

@@ -78,7 +78,7 @@ function DecalEditorPlugin::onWorldEditorStartup( %this )
    
    // Add ourselves to the ToolsToolbar
    %tooltip = "Decal Editor (" @ %accel @ ")";   
-   EditorGui.addToToolsToolbar( "DecalEditorPlugin", "DecalEditorPalette", expandFilename("tools/decalEditor/decal-editor"), %tooltip );
+   EditorGui.addToToolsToolbar( "DecalEditorPlugin", "DecalEditorPalette", "ToolsModule:decal_editor_n_image", %tooltip );
 
    //connect editor windows   
    GuiWindowCtrl::attach( DecalPreviewWindow, DecalEditorWindow );

Templates/BaseGame/game/tools/editorClasses/gui/images/images_window_image.asset.taml

@@ -0,0 +1,8 @@
+<ImageAsset
+    canSave="true"
+    canSaveDynamicFields="true"
+    AssetName="images_window_image"
+    imageFile="@assetFile=window.png"
+    UseMips="true"
+    isHDRImage="false"
+    imageType="Albedo" />

Templates/BaseGame/game/tools/editorClasses/gui/panels/navPanelProfiles.ed.tscript

@@ -30,36 +30,36 @@ singleton GuiControlProfile (NavPanelProfile)
 
 singleton GuiControlProfile (NavPanel : NavPanelProfile) 
 {
-   bitmap = "./navPanel";
+   bitmapAsset = "ToolsModule:navPanel_image";
    category = "Editor";
 };
 
 singleton GuiControlProfile (NavPanelBlue : NavPanelProfile) 
 {
-   bitmap = "./navPanel_blue";
+   bitmapAsset = "ToolsModule:navPanel_blue_image";
    category = "Editor";
 };
 
 singleton GuiControlProfile (NavPanelGreen : NavPanelProfile) 
 {
-   bitmap = "./navPanel_green";
+   bitmapAsset = "ToolsModule:navPanel_green_image";
    category = "Editor";
 };
 
 singleton GuiControlProfile (NavPanelRed : NavPanelProfile) 
 {
-   bitmap = "./navPanel_red";
+   bitmapAsset = "ToolsModule:navPanel_red_image";
    category = "Editor";
 };
 
 singleton GuiControlProfile (NavPanelWhite : NavPanelProfile) 
 {
-   bitmap = "./navPanel_white";
+   bitmapAsset = "ToolsModule:navPanel_white_image";
    category = "Editor";
 };
 
 singleton GuiControlProfile (NavPanelYellow : NavPanelProfile) 
 {
-   bitmap = "./navPanel_yellow";
+   bitmapAsset = "ToolsModule:navPanel_yellow_image";
    category = "Editor";
 };

Templates/BaseGame/game/tools/forestEditor/forestEditToolbar.ed.gui

@@ -118,7 +118,7 @@
             canSaveDynamicFields = "0";
          };
          new GuiBitmapButtonCtrl() {
-            bitmap = "tools/gui/images/dropslider";
+            bitmapAsset = "ToolsModule:dropslider_n_image";
             groupNum = "-1";
             buttonType = "PushButton";
             useMouseEvents = "0";
@@ -220,7 +220,7 @@
             canSaveDynamicFields = "0";
          };
          new GuiBitmapButtonCtrl() {
-            bitmap = "tools/gui/images/dropslider";
+            bitmapAsset = "ToolsModule:dropslider_n_image";
             groupNum = "-1";
             buttonType = "PushButton";
             useMouseEvents = "0";
@@ -322,7 +322,7 @@
             canSaveDynamicFields = "0";
          };
          new GuiBitmapButtonCtrl() {
-            bitmap = "tools/gui/images/dropslider";
+            bitmapAsset = "ToolsModule:dropslider_n_image";
             groupNum = "-1";
             buttonType = "PushButton";
             useMouseEvents = "0";

Templates/BaseGame/game/tools/forestEditor/forestEditorGui.gui

@@ -295,7 +295,7 @@
          canSaveDynamicFields = "0";
 
          new GuiBitmapButtonCtrl() {
-            bitmap = "tools/forestEditor/images/new-mesh";
+            bitmapAsset = "ToolsModule:new_mesh_n_image";
             groupNum = "-1";
             buttonType = "PushButton";
             useMouseEvents = "0";
@@ -315,7 +315,7 @@
             canSaveDynamicFields = "0";
          };
          new GuiBitmapButtonCtrl() {
-            bitmap = "tools/gui/images/delete";
+            bitmapAsset = "ToolsModule:delete_n_image";
             groupNum = "-1";
             buttonType = "PushButton";
             useMouseEvents = "0";
@@ -358,7 +358,7 @@
          canSaveDynamicFields = "0";
 
          new GuiBitmapButtonCtrl() {
-            bitmap = "tools/forestEditor/images/new-brush";
+            bitmapAsset = "ToolsModule:new_brush_n_image";
             groupNum = "-1";
             buttonType = "PushButton";
             useMouseEvents = "0";
@@ -378,7 +378,7 @@
             canSaveDynamicFields = "0";
          };
          new GuiBitmapButtonCtrl() {
-            bitmap = "tools/forestEditor/images/new-element";
+            bitmapAsset = "ToolsModule:new_element_n_image";
             groupNum = "-1";
             buttonType = "PushButton";
             useMouseEvents = "0";
@@ -398,7 +398,7 @@
             canSaveDynamicFields = "0";
          };
          new GuiBitmapButtonCtrl() {
-            bitmap = "tools/gui/images/delete";
+            bitmapAsset = "ToolsModule:delete_n_image";
             groupNum = "-1";
             buttonType = "PushButton";
             useMouseEvents = "0";

Templates/BaseGame/game/tools/forestEditor/main.tscript

@@ -119,7 +119,7 @@ function ForestEditorPlugin::onWorldEditorStartup( %this )
    
    // Add ourselves to the tools menu.
    %tooltip = "Forest Editor (" @ %accel @ ")";  
-   EditorGui.addToToolsToolbar( "ForestEditorPlugin", "ForestEditorPalette", expandFilename("tools/forestEditor/images/forest-editor-btn"), %tooltip );   
+   EditorGui.addToToolsToolbar( "ForestEditorPlugin", "ForestEditorPalette", "ToolsModule:forest_editor_btn_n_image", %tooltip );   
    
    //connect editor windows
    GuiWindowCtrl::attach( ForestEditorPropertiesWindow, ForestEditorPalleteWindow );

Templates/BaseGame/game/tools/gui/assimpImport.ed.tscript

@@ -284,7 +284,7 @@ function AssimpImportDlg::showDialog(%this, %shapePath, %cmd)
    if (isFile(%csPath))
       exec(%csPath);
 
-   %this.constructor = ShapeEditor.findConstructor(%this.path);
+   %this.constructor = findShapeConstructorByFilename(%this.path);
 
    // Only show the import dialog if required. Note that 'GetShapeInfo' will
    // fail if the source file is missing, or a cached.dts is available.

Templates/BaseGame/game/tools/gui/colladaImport.ed.gui

@@ -1259,7 +1259,7 @@ function ColladaImportDlg::showDialog(%this, %shapePath, %cmd)
    if (isFile(%csPath))
       exec(%csPath);
 
-   %this.constructor = ShapeEditor.findConstructor(%this.path);
+   %this.constructor = findShapeConstructorByFilename(%this.path);
 
    // Only show the import dialog if required. Note that 'enumColladaScene' will
    // fail if the COLLADA file is missing, or a cached.dts is available.

Templates/BaseGame/game/tools/gui/cubemapEditor.gui

@@ -170,7 +170,7 @@
          groupNum = "-1";
          buttonType = "PushButton";
          useMouseEvents = "0";
-         bitmap = "tools/materialEditor/gui/cubemapBtnBorder";
+         bitmapAsset = "ToolsModule:cubemapBtnBorder_n_image";
       };
       // ------------------------------ X Negitive ------------------------------------
       new GuiBitmapCtrl(matEd_cubemapEd_XNeg) {
@@ -213,7 +213,7 @@
          groupNum = "-1";
          buttonType = "PushButton";
          useMouseEvents = "0";
-         bitmap = "tools/materialEditor/gui/cubemapBtnBorder";
+         bitmapAsset = "ToolsModule:cubemapBtnBorder_n_image";
       };
       // ------------------------------ Y Positive ------------------------------------
       new GuiBitmapCtrl(matEd_cubemapEd_YPos) {
@@ -256,7 +256,7 @@
          groupNum = "-1";
          buttonType = "PushButton";
          useMouseEvents = "0";
-         bitmap = "tools/materialEditor/gui/cubemapBtnBorder";
+         bitmapAsset = "ToolsModule:cubemapBtnBorder_n_image";
       };
       // ------------------------------ Y Negitive ------------------------------------
       new GuiBitmapCtrl(matEd_cubemapEd_YNeG) {
@@ -299,7 +299,7 @@
          groupNum = "-1";
          buttonType = "PushButton";
          useMouseEvents = "0";
-         bitmap = "tools/materialEditor/gui/cubemapBtnBorder";
+         bitmapAsset = "ToolsModule:cubemapBtnBorder_n_image";
       };
       // ------------------------------ Z Positive ------------------------------------
       new GuiBitmapCtrl(matEd_cubemapEd_ZPos) {
@@ -342,7 +342,7 @@
          groupNum = "-1";
          buttonType = "PushButton";
          useMouseEvents = "0";
-         bitmap = "tools/materialEditor/gui/cubemapBtnBorder";
+         bitmapAsset = "ToolsModule:cubemapBtnBorder_n_image";
       };
       // ------------------------------ Z Negitive ------------------------------------
       new GuiBitmapCtrl(matEd_cubemapEd_ZNeg) {
@@ -385,7 +385,7 @@
          groupNum = "-1";
          buttonType = "PushButton";
          useMouseEvents = "0";
-         bitmap = "tools/materialEditor/gui/cubemapBtnBorder";
+         bitmapAsset = "ToolsModule:cubemapBtnBorder_n_image";
       };
 
        // Create New Cubemap
@@ -404,7 +404,7 @@
          Command = "matEd_addCubemapWindow.setVisible(1);"; // -------------- Needs Hookup Create New Cubemap
          hovertime = "1000";
          tooltip = "Create New Cubemap";
-         bitmap = "tools/gui/images/new";
+         bitmapAsset = "ToolsModule:new_n_image";
          groupNum = "-1";
          buttonType = "PushButton";
          useMouseEvents = "0";
@@ -424,7 +424,7 @@
          Command = "MaterialEditorGui.showDeleteCubemapDialog();"; // -------------- Needs Hookup Delete Cubemap
          hovertime = "1000";
          tooltip = "Delete Cubemap";
-         bitmap = "tools/gui/images/delete";
+         bitmapAsset = "ToolsModule:delete_n_image";
          groupNum = "-1";
          buttonType = "PushButton";
          useMouseEvents = "0";
@@ -445,7 +445,7 @@
          Command = "MaterialEditorGui.showSaveCubemapDialog();"; // -------------- Needs Hookup Save Cubemap
          hovertime = "1000";
          tooltip = "Save Cubemap";
-         bitmap = "tools/gui/images/save-icon";
+         bitmapAsset = "ToolsModule:save_icon_n_image";
          groupNum = "-1";
          buttonType = "PushButton";
          useMouseEvents = "0";

Templates/BaseGame/game/tools/gui/guiObjectInspector.ed.gui

@@ -94,7 +94,7 @@
          };
          
          new GuiBitmapButtonCtrl() {
-            bitmap = "tools/gui/images/clear-icon";
+            bitmapAsset = "ToolsModule:clear_icon_n_image";
             groupNum = "-1";
             buttonType = "PushButton";
             useMouseEvents = "0";

Templates/BaseGame/game/tools/gui/images/menubar/menubar_snap_grid_d_image.asset.taml

@@ -0,0 +1,8 @@
+<ImageAsset
+    canSave="true"
+    canSaveDynamicFields="true"
+    AssetName="menubar_snap_grid_d_image"
+    imageFile="@assetFile=snap-grid_d.png"
+    UseMips="true"
+    isHDRImage="false"
+    imageType="Albedo" />

Templates/BaseGame/game/tools/gui/images/menubar/menubar_snap_grid_h_image.asset.taml

@@ -0,0 +1,8 @@
+<ImageAsset
+    canSave="true"
+    canSaveDynamicFields="true"
+    AssetName="menubar_snap_grid_h_image"
+    imageFile="@assetFile=snap-grid_h.png"
+    UseMips="true"
+    isHDRImage="false"
+    imageType="Albedo" />

Templates/BaseGame/game/tools/gui/images/menubar/menubar_snap_grid_n_image.asset.taml

@@ -0,0 +1,8 @@
+<ImageAsset
+    canSave="true"
+    canSaveDynamicFields="true"
+    AssetName="menubar_snap_grid_n_image"
+    imageFile="@assetFile=snap-grid_n.png"
+    UseMips="true"
+    isHDRImage="false"
+    imageType="Albedo" />

Templates/BaseGame/game/tools/gui/images/treeview/treeview_default_image.asset.taml

@@ -0,0 +1,8 @@
+<ImageAsset
+    canSave="true"
+    canSaveDynamicFields="true"
+    AssetName="treeview_default_image"
+    imageFile="@assetFile=default.png"
+    UseMips="true"
+    isHDRImage="false"
+    imageType="Albedo" />

Templates/BaseGame/game/tools/gui/materialSelector.ed.gui

@@ -157,7 +157,7 @@ new GuiControl(MaterialSelectorOverlay, EditorGuiGroup) {
          Command = "MaterialSelector.showDeleteDialog();";
          hovertime = "1000";
          tooltip = "Delete Material";
-         bitmap = "tools/gui/images/delete";
+         bitmapAsset = "ToolsModule:delete_n_image";
          groupNum = "-1";
          buttonType = "PushButton";
          useMouseEvents = "0";
@@ -894,7 +894,7 @@ function MaterialSelector::buildStaticFilters( %this )
             Command = "MaterialSelector_addFilterWindow.setVisible(1); MaterialSelectorOverlay.pushToBack(MaterialSelector_addFilterWindow);";
             hovertime = "1000";
             tooltip = "Create New Tag";
-            bitmap = "tools/gui/images/new";
+            bitmapAsset = "ToolsModule:new_n_image";
             groupNum = "-1";
             buttonType = "PushButton";
             useMouseEvents = "0";
@@ -914,7 +914,7 @@ function MaterialSelector::buildStaticFilters( %this )
             Command = "MaterialSelector.clearMaterialFilters();";
             hovertime = "1000";
             tooltip = "Clear Selected Tag";
-            bitmap = "tools/gui/images/clear-btn";
+            bitmapAsset = "ToolsModule:clear_btn_n_image";
             groupNum = "-1";
             buttonType = "PushButton";
             useMouseEvents = "0";
@@ -1226,7 +1226,7 @@ function MaterialSelector::buildPreviewArray( %this, %material )
       position = "7 4";
       extent = "64 64";
       buttonType = "PushButton";
-      bitmap = "";
+      bitmapAsset = "";
       Command = "";
       text = "Loading...";
       useStates = false;
@@ -1239,7 +1239,7 @@ function MaterialSelector::buildPreviewArray( %this, %material )
             extent = "64 64";
             Variable = "";
             buttonType = "toggleButton";
-            bitmap = "tools/materialEditor/gui/cubemapBtnBorder";
+            bitmapAsset = "ToolsModule:cubemapBtnBorder_n_image";
             groupNum = "0";
             text = "";
          }; 
@@ -1662,7 +1662,7 @@ function MaterialSelector::createNewMaterial( %this )
             extent = "64 64";
             Variable = "";
             buttonType = "toggleButton";
-            bitmap = "tools/materialEditor/gui/cubemapBtnBorder";
+            bitmapAsset = "ToolsModule:cubemapBtnBorder_n_image";
             groupNum = "0";
             text = "";
          }; 

Templates/BaseGame/game/tools/gui/postFxEditor.gui

@@ -96,7 +96,7 @@
             canSaveDynamicFields = "0";
 
             new GuiBitmapButtonCtrl() {
-               bitmap = "tools/gui/images/iconAdd.png";
+               bitmapAsset = "ToolsModule:iconAdd_image";
                bitmapMode = "Centered";
                autoFitExtents = "0";
                useModifiers = "0";
@@ -122,7 +122,7 @@
                canSaveDynamicFields = "0";
             };
             new GuiBitmapButtonCtrl() {
-               bitmap = "tools/gui/images/iconDelete.png";
+               bitmapAsset = "ToolsModule:iconDelete_image";
                bitmapMode = "Centered";
                autoFitExtents = "0";
                useModifiers = "0";

Templates/BaseGame/game/tools/gui/profiles.ed.tscript

@@ -60,7 +60,7 @@ new GuiControlProfile (ToolsGuiDefaultProfile)
    fontColorSEL= EditorSettings.value("Theme/fieldTextSELColor");
 
    // bitmap information
-   bitmap = "";
+   bitmapAsset = "";
    bitmapBase = "";
    textOffset = "0 0";
 

Templates/BaseGame/game/tools/guiEditor/gui/guiEditor.ed.gui

@@ -71,7 +71,7 @@
             canSaveDynamicFields = "0";
 
             new GuiBitmapButtonCtrl(GHWorldEditor) {
-               bitmap = "tools/worldEditor/images/toolbar/world";
+               bitmapAsset = "ToolsModule:world_image";
                bitmapMode = "Stretched";
                autoFitExtents = "0";
                groupNum = "0";
@@ -93,7 +93,7 @@
                canSaveDynamicFields = "0";
             };
             new GuiBitmapButtonCtrl(GHGuiEditor) {
-               bitmap = "tools/worldEditor/images/toolbar/gui";
+               bitmapAsset = "ToolsModule:gui_image";
                bitmapMode = "Stretched";
                autoFitExtents = "0";
                groupNum = "0";
@@ -114,7 +114,7 @@
                canSaveDynamicFields = "0";
             };
             new GuiBitmapButtonCtrl() {
-               bitmap = "tools/worldEditor/images/toolbar/playbutton";
+               bitmapAsset = "ToolsModule:playbutton_n_image";
                bitmapMode = "Stretched";
                autoFitExtents = "0";
                groupNum = "0";
@@ -152,7 +152,7 @@
                tooltipprofile = "ToolsGuiToolTipProfile";
                ToolTip = "Asset Browser";
                hovertime = "750";
-               bitmap = "tools/gui/images/stencilIcons/menuGrid";
+               bitmapAsset = "ToolsModule:menuGrid_image";
                bitmapMode = "Stretched";
                buttonType = "PushButton";
                groupNum = "0";
@@ -272,7 +272,7 @@
                canSaveDynamicFields = "0";
 
                new GuiBitmapButtonCtrl(GuiEditorSnapCheckBox) {
-                  bitmap = "tools/gui/images/GUI-editor/snap-grid";
+                  bitmapAsset = "ToolsModule:snap_grid_n_image";
                   bitmapMode = "Stretched";
                   autoFitExtents = "0";
                   groupNum = "-1";
@@ -293,7 +293,7 @@
                   canSaveDynamicFields = "0";
                };
                new GuiBitmapButtonCtrl(GuiEditorEdgeSnapping_btn) {
-                  bitmap = "tools/gui/images/GUI-editor/edgesnap";
+                  bitmapAsset = "ToolsModule:edgesnap_n_image";
                   bitmapMode = "Stretched";
                   autoFitExtents = "0";
                   groupNum = "-1";
@@ -315,7 +315,7 @@
                   canSaveDynamicFields = "0";
                };
                new GuiBitmapButtonCtrl(GuiEditorCenterSnapping_btn) {
-                  bitmap = "tools/gui/images/GUI-editor/centersnap";
+                  bitmapAsset = "ToolsModule:centersnap_n_image";
                   bitmapMode = "Stretched";
                   autoFitExtents = "0";
                   groupNum = "-1";
@@ -368,7 +368,7 @@
                canSaveDynamicFields = "0";
 
                new GuiBitmapButtonCtrl() {
-                  bitmap = "tools/gui/images/GUI-editor/align-left";
+                  bitmapAsset = "ToolsModule:align_left_n_image";
                   bitmapMode = "Stretched";
                   autoFitExtents = "0";
                   groupNum = "-1";
@@ -390,7 +390,7 @@
                   canSaveDynamicFields = "0";
                };
                new GuiBitmapButtonCtrl() {
-                  bitmap = "tools/gui/images/GUI-editor/vertical-center";
+                  bitmapAsset = "ToolsModule:vertical_center_n_image";
                   bitmapMode = "Stretched";
                   autoFitExtents = "0";
                   groupNum = "-1";
@@ -412,7 +412,7 @@
                   canSaveDynamicFields = "0";
                };
                new GuiBitmapButtonCtrl() {
-                  bitmap = "tools/gui/images/GUI-editor/align-right";
+                  bitmapAsset = "ToolsModule:align_right_n_image";
                   bitmapMode = "Stretched";
                   autoFitExtents = "0";
                   groupNum = "-1";
@@ -449,7 +449,7 @@
                canSaveDynamicFields = "0";
 
                new GuiBitmapButtonCtrl() {
-                  bitmap = "tools/gui/images/GUI-editor/align-top";
+                  bitmapAsset = "ToolsModule:align_top_n_image";
                   bitmapMode = "Stretched";
                   autoFitExtents = "0";
                   groupNum = "-1";
@@ -471,7 +471,7 @@
                   canSaveDynamicFields = "0";
                };
                new GuiBitmapButtonCtrl() {
-                  bitmap = "tools/gui/images/GUI-editor/horizontal-center";
+                  bitmapAsset = "ToolsModule:horizontal_center_n_image";
                   bitmapMode = "Stretched";
                   autoFitExtents = "0";
                   groupNum = "-1";
@@ -493,7 +493,7 @@
                   canSaveDynamicFields = "0";
                };
                new GuiBitmapButtonCtrl() {
-                  bitmap = "tools/gui/images/GUI-editor/align-bottom";
+                  bitmapAsset = "ToolsModule:align_bottom_n_image";
                   bitmapMode = "Stretched";
                   autoFitExtents = "0";
                   groupNum = "-1";
@@ -562,7 +562,7 @@
                canSaveDynamicFields = "0";
 
                new GuiBitmapButtonCtrl() {
-                  bitmap = "tools/gui/images/GUI-editor/send-to-back";
+                  bitmapAsset = "ToolsModule:send_to_back_n_image";
                   bitmapMode = "Stretched";
                   autoFitExtents = "0";
                   groupNum = "-1";
@@ -584,7 +584,7 @@
                   canSaveDynamicFields = "0";
                };
                new GuiBitmapButtonCtrl() {
-                  bitmap = "tools/gui/images/GUI-editor/bring-to-front";
+                  bitmapAsset = "ToolsModule:bring_to_front_n_image";
                   bitmapMode = "Stretched";
                   autoFitExtents = "0";
                   groupNum = "-1";
@@ -621,7 +621,7 @@
                canSaveDynamicFields = "0";
 
                new GuiBitmapButtonCtrl() {
-                  bitmap = "tools/gui/images/GUI-editor/distribute-horizontal";
+                  bitmapAsset = "ToolsModule:distribute_horizontal_n_image";
                   bitmapMode = "Stretched";
                   autoFitExtents = "0";
                   groupNum = "-1";
@@ -643,7 +643,7 @@
                   canSaveDynamicFields = "0";
                };
                new GuiBitmapButtonCtrl() {
-                  bitmap = "tools/gui/images/GUI-editor/distribute-vertical";
+                  bitmapAsset = "ToolsModule:distribute_vertical_n_image";
                   bitmapMode = "Stretched";
                   autoFitExtents = "0";
                   groupNum = "-1";
@@ -886,7 +886,7 @@
                      };
                      
                      new GuiBitmapButtonCtrl() {
-                        bitmap = "tools/gui/images/clear-icon";
+                        bitmapAsset = "ToolsModule:clear_icon_n_image";
                         groupNum = "-1";
                         buttonType = "PushButton";
                         useMouseEvents = "0";
@@ -1199,7 +1199,7 @@
                      };
                      
                      new GuiBitmapButtonCtrl() {
-                        bitmap = "tools/gui/images/clear-icon";
+                        bitmapAsset = "ToolsModule:clear_icon_n_image";
                         groupNum = "-1";
                         buttonType = "PushButton";
                         useMouseEvents = "0";
@@ -1322,7 +1322,7 @@
                         canSaveDynamicFields = "0";
                      };
                      new GuiBitmapButtonCtrl() {
-                        bitmap = "tools/gui/images/save-icon";
+                        bitmapAsset = "ToolsModule:save_icon_n_image";
                         groupNum = "-1";
                         buttonType = "PushButton";
                         useMouseEvents = "0";
@@ -1342,7 +1342,7 @@
                         canSaveDynamicFields = "0";
                      };
                      new GuiBitmapButtonCtrl() {
-                        bitmap = "tools/gui/images/save-as";
+                        bitmapAsset = "ToolsModule:save_as_n_image";
                         groupNum = "-1";
                         buttonType = "PushButton";
                         useMouseEvents = "0";
@@ -1439,7 +1439,7 @@
          };
 
          new GuiBitmapButtonCtrl() {
-            bitmap = "tools/gui/images/delete";
+            bitmapAsset = "ToolsModule:delete_n_image";
             groupNum = "-1";
             buttonType = "PushButton";
             useMouseEvents = "0";
@@ -1458,7 +1458,7 @@
             canSaveDynamicFields = "0";
          };
          new GuiBitmapButtonCtrl() {
-            bitmap = "tools/gui/images/delete";
+            bitmapAsset = "ToolsModule:delete_n_image";
             groupNum = "-1";
             buttonType = "PushButton";
             useMouseEvents = "0";
@@ -1477,7 +1477,7 @@
             canSaveDynamicFields = "0";
          };
          new GuiBitmapButtonCtrl() {
-            bitmap = "tools/gui/images/delete";
+            bitmapAsset = "ToolsModule:delete_n_image";
             groupNum = "-1";
             buttonType = "PushButton";
             useMouseEvents = "0";
@@ -1496,7 +1496,7 @@
             canSaveDynamicFields = "0";
          };
          new GuiBitmapButtonCtrl() {
-            bitmap = "tools/gui/images/delete";
+            bitmapAsset = "ToolsModule:delete_n_image";
             groupNum = "-1";
             buttonType = "PushButton";
             useMouseEvents = "0";

Templates/BaseGame/game/tools/levels/DefaultEditorLevel.asset.taml

@@ -6,5 +6,13 @@
     LevelName="DefaultEditorLevel"
     isSubScene="false"
     description="An empty room"
-    staticObjectAssetDependency0="@Asset=Prototyping:FloorGray"
+    previewImageAsset0="@asset=ToolsModule:DefaultEditorLevel_preview_image"
+    previewImageAsset1="@asset=ToolsModule:DefaultEditorLevel_preview_image"
+    previewImageAsset2="@asset=ToolsModule:DefaultEditorLevel_preview_image"
+    previewImageAsset3="@asset=ToolsModule:DefaultEditorLevel_preview_image"
+    previewImageAsset4="@asset=ToolsModule:DefaultEditorLevel_preview_image"
+    previewImageAsset5="@asset=ToolsModule:DefaultEditorLevel_preview_image"
+    previewImageAsset6="@asset=ToolsModule:DefaultEditorLevel_preview_image"
+    staticObjectAssetDependency0="@asset=Prototyping:FloorGray"
+    staticObjectAssetDependency1="@asset=FPSGameplay:soldier_rigged"
     VersionId="1" />

Templates/BaseGame/game/tools/levels/EditorTemplateLevel.asset.taml

@@ -5,4 +5,11 @@
     LevelFile="@assetFile=EditorTemplateLevel.mis"
     LevelName="EditorTemplateLevel"
     isSubScene="false"
+    previewImageAsset0="@asset=ToolsModule:DefaultEditorLevel_preview_image"
+    previewImageAsset1="@asset=ToolsModule:DefaultEditorLevel_preview_image"
+    previewImageAsset2="@asset=ToolsModule:DefaultEditorLevel_preview_image"
+    previewImageAsset3="@asset=ToolsModule:DefaultEditorLevel_preview_image"
+    previewImageAsset4="@asset=ToolsModule:DefaultEditorLevel_preview_image"
+    previewImageAsset5="@asset=ToolsModule:DefaultEditorLevel_preview_image"
+    previewImageAsset6="@asset=ToolsModule:DefaultEditorLevel_preview_image"
     VersionId="1" />

Templates/BaseGame/game/tools/materialEditor/gui/MaterialToolbar.ed.gui

@@ -59,7 +59,7 @@
       tooltipprofile = "ToolsGuiToolTipProfile";
       ToolTip = "Select and Edit an Existing Material";
       hovertime = "1000";
-      bitmap = "tools/materialEditor/gui/materialSelectorIcon";
+      bitmapAsset = "ToolsModule:materialSelectorIcon_n_image";
       text = "";
       groupNum = "-1";
       buttonType = "PushButton";

Templates/BaseGame/game/tools/materialEditor/gui/cubemaped_cubepreview.tscript

@@ -1,7 +1,7 @@
 
 singleton TSShapeConstructor(cubemaped_cubepreviewdts)
 {
-   baseShape = "./cubemaped_cubepreview.dts";
+   baseShapeAsset = "ToolsModule:cubemaped_cubepreview";
    singleDetailSize = "0";
    flipUVCoords = "0";
    JoinIdenticalVerts = "0";

Templates/BaseGame/game/tools/materialEditor/gui/cubemaped_cylinderpreview.tscript

@@ -1,7 +1,7 @@
 
 singleton TSShapeConstructor(cubemaped_cylinderpreviewdts)
 {
-   baseShape = "./cubemaped_cylinderpreview.dts";
+   baseShapeAsset = "ToolsModule:cubemaped_cylinderpreview";
    singleDetailSize = "0";
    flipUVCoords = "0";
    JoinIdenticalVerts = "0";

Templates/BaseGame/game/tools/materialEditor/gui/cubemaped_spherepreview.tscript

@@ -1,7 +1,7 @@
 
 singleton TSShapeConstructor(cubemaped_spherepreviewdts)
 {
-   baseShape = "./cubemaped_spherepreview.dts";
+   baseShapeAsset = "ToolsModule:cubemaped_spherepreview";
    singleDetailSize = "0";
    flipUVCoords = "0";
    JoinIdenticalVerts = "0";

Templates/BaseGame/game/tools/materialEditor/gui/cubepreview.tscript

@@ -1,7 +1,7 @@
 
 singleton TSShapeConstructor(cubepreviewdts)
 {
-   baseShape = "./cubepreview.dts";
+   baseShapeAsset = "ToolsModule:cubepreview";
    singleDetailSize = "0";
    flipUVCoords = "0";
    JoinIdenticalVerts = "0";

Templates/BaseGame/game/tools/materialEditor/gui/cylinderpreview.tscript

@@ -1,7 +1,7 @@
 
 singleton TSShapeConstructor(cylinderpreviewdts)
 {
-   baseShape = "./cylinderpreview.dts";
+   baseShapeAsset = "ToolsModule:cylinderpreview";
    singleDetailSize = "0";
    flipUVCoords = "0";
    JoinIdenticalVerts = "0";

Templates/BaseGame/game/tools/materialEditor/gui/guiMaterialPropertiesWindow.ed.gui

@@ -112,7 +112,7 @@
                   Extent = "17 17";
                   HorizSizing = "left";
                   tooltip = "Swap material on the object with existing";
-                  bitmap = "tools/materialEditor/gui/change-material-btn";
+                  bitmapAsset = "ToolsModule:change_material_btn_n_image";
                   command = "materialSelector.showDialog(\"MaterialEditorGui.showMaterialChangeSaveDialog\");"; 
                };
                
@@ -299,7 +299,7 @@
                            groupNum = "-1";
                            buttonType = "PushButton";
                            useMouseEvents = "0";
-                           bitmap = "tools/materialEditor/gui/cubemapBtnBorder";
+                           bitmapAsset = "ToolsModule:cubemapBtnBorder_n_image";
                         };
                         new GuiTextCtrl() {
                            canSaveDynamicFields = "0";
@@ -399,7 +399,7 @@
                            groupNum = "-1";
                            buttonType = "PushButton";
                            useMouseEvents = "0";
-                           bitmap = "tools/gui/images/delete";
+                           bitmapAsset = "ToolsModule:delete_n_image";
                         };
                      };
                      new GuiBitmapCtrl(){
@@ -473,7 +473,7 @@
                            groupNum = "-1";
                            buttonType = "PushButton";
                            useMouseEvents = "0";
-                           bitmap = "tools/materialEditor/gui/cubemapBtnBorder";
+                           bitmapAsset = "ToolsModule:cubemapBtnBorder_n_image";
                         };
                         new GuiTextCtrl() {
                            canSaveDynamicFields = "0";
@@ -525,7 +525,7 @@
                            groupNum = "-1";
                            buttonType = "PushButton";
                            useMouseEvents = "0";
-                           bitmap = "tools/gui/images/delete";
+                           bitmapAsset = "ToolsModule:delete_n_image";
                         };
                      };
 				   };
@@ -828,7 +828,7 @@
                            groupNum = "-1";
                            buttonType = "PushButton";
                            useMouseEvents = "0";
-                           bitmap = "tools/materialEditor/gui/cubemapBtnBorder";
+                           bitmapAsset = "ToolsModule:cubemapBtnBorder_n_image";
                         };
                         new GuiTextCtrl() {
                            canSaveDynamicFields = "0";
@@ -880,7 +880,7 @@
                            groupNum = "-1";
                            buttonType = "PushButton";
                            useMouseEvents = "0";
-                           bitmap = "tools/gui/images/delete";
+                           bitmapAsset = "ToolsModule:delete_n_image";
                         };
                      };
 				   new GuiBitmapCtrl() {
@@ -929,7 +929,7 @@
 					     maxLength = "1024";
 					  };
 					  new GuiBitmapButtonCtrl() {
-						 bitmap = "tools/gui/images/save-icon";
+						 bitmapAsset = "ToolsModule:save_icon_n_image";
 						 bitmapMode = "Stretched";
 						 autoFitExtents = "0";
 						 useModifiers = "0";
@@ -1033,7 +1033,7 @@
 						 canSaveDynamicFields = "0";
 					  };
 					  new GuiBitmapButtonCtrl() {
-						 bitmap = "tools/materialEditor/gui/cubemapBtnBorder";
+						 bitmapAsset = "ToolsModule:cubemapBtnBorder_n_image";
 						 bitmapMode = "Stretched";
 						 autoFitExtents = "0";
 						 useModifiers = "0";
@@ -1102,7 +1102,7 @@
 						 canSaveDynamicFields = "0";
 					  };
 					  new GuiBitmapButtonCtrl() {
-						 bitmap = "tools/gui/images/delete";
+						 bitmapAsset = "ToolsModule:delete_n_image";
 						 bitmapMode = "Stretched";
 						 autoFitExtents = "0";
 						 useModifiers = "0";
@@ -1269,7 +1269,7 @@
 						 canSaveDynamicFields = "0";
 					  };
 					  new GuiBitmapButtonCtrl() {
-						 bitmap = "tools/materialEditor/gui/cubemapBtnBorder";
+						 bitmapAsset = "ToolsModule:cubemapBtnBorder_n_image";
 						 bitmapMode = "Stretched";
 						 autoFitExtents = "0";
 						 useModifiers = "0";
@@ -1338,7 +1338,7 @@
 						 canSaveDynamicFields = "0";
 					  };
 					  new GuiBitmapButtonCtrl() {
-						 bitmap = "tools/gui/images/delete";
+						 bitmapAsset = "ToolsModule:delete_n_image";
 						 bitmapMode = "Stretched";
 						 autoFitExtents = "0";
 						 useModifiers = "0";
@@ -1505,7 +1505,7 @@
 						 canSaveDynamicFields = "0";
 					  };
 					  new GuiBitmapButtonCtrl() {
-						 bitmap = "tools/materialEditor/gui/cubemapBtnBorder";
+						 bitmapAsset = "ToolsModule:cubemapBtnBorder_n_image";
 						 bitmapMode = "Stretched";
 						 autoFitExtents = "0";
 						 useModifiers = "0";
@@ -1574,7 +1574,7 @@
 						 canSaveDynamicFields = "0";
 					  };
 					  new GuiBitmapButtonCtrl() {
-						 bitmap = "tools/gui/images/delete";
+						 bitmapAsset = "ToolsModule:delete_n_image";
 						 bitmapMode = "Stretched";
 						 autoFitExtents = "0";
 						 useModifiers = "0";
@@ -1757,7 +1757,7 @@
 						 canSaveDynamicFields = "0";
 					  };
 					  new GuiBitmapButtonCtrl() {
-						 bitmap = "tools/materialEditor/gui/cubemapBtnBorder";
+						 bitmapAsset = "ToolsModule:cubemapBtnBorder_n_image";
 						 bitmapMode = "Stretched";
 						 autoFitExtents = "0";
 						 useModifiers = "0";
@@ -1826,7 +1826,7 @@
 						 canSaveDynamicFields = "0";
 					  };
 					  new GuiBitmapButtonCtrl() {
-						 bitmap = "tools/gui/images/delete";
+						 bitmapAsset = "ToolsModule:delete_n_image";
 						 bitmapMode = "Stretched";
 						 autoFitExtents = "0";
 						 useModifiers = "0";
@@ -1989,7 +1989,7 @@
                            groupNum = "-1";
                            buttonType = "PushButton";
                            useMouseEvents = "0";
-                           bitmap = "tools/materialEditor/gui/cubemapBtnBorder";
+                           bitmapAsset = "ToolsModule:cubemapBtnBorder_n_image";
                         };
                         
                         new GuiTextCtrl() { // Detailmap Scale text
@@ -2081,7 +2081,7 @@
                            groupNum = "-1";
                            buttonType = "PushButton";
                            useMouseEvents = "0";
-                           bitmap = "tools/gui/images/delete";
+                           bitmapAsset = "ToolsModule:delete_n_image";
                         };
                      };
                      new GuiBitmapCtrl(){
@@ -2134,7 +2134,7 @@
                            groupNum = "-1";
                            buttonType = "PushButton";
                            useMouseEvents = "0";
-                           bitmap = "tools/materialEditor/gui/cubemapBtnBorder";
+                           bitmapAsset = "ToolsModule:cubemapBtnBorder_n_image";
                         };
                         
                         new GuiTextCtrl() { // Detail Normal Map Strength text
@@ -2226,7 +2226,7 @@
                            groupNum = "-1";
                            buttonType = "PushButton";
                            useMouseEvents = "0";
-                           bitmap = "tools/gui/images/delete";
+                           bitmapAsset = "ToolsModule:delete_n_image";
                         };
                      };
                      new GuiBitmapCtrl(){
@@ -2279,7 +2279,7 @@
                            groupNum = "-1";
                            buttonType = "PushButton";
                            useMouseEvents = "0";
-                           bitmap = "tools/materialEditor/gui/cubemapBtnBorder";
+                           bitmapAsset = "ToolsModule:cubemapBtnBorder_n_image";
                         };
                         new GuiTextCtrl() {
                            canSaveDynamicFields = "0";
@@ -2353,7 +2353,7 @@
                            groupNum = "-1";
                            buttonType = "PushButton";
                            useMouseEvents = "0";
-                           bitmap = "tools/gui/images/delete";
+                           bitmapAsset = "ToolsModule:delete_n_image";
                         };
                      };
                      new GuiBitmapCtrl(){
@@ -2427,7 +2427,7 @@
                            groupNum = "-1";
                            buttonType = "PushButton";
                            useMouseEvents = "0";
-                           bitmap = "tools/materialEditor/gui/cubemapBtnBorder";
+                           bitmapAsset = "ToolsModule:cubemapBtnBorder_n_image";
                         };
                         new GuiTextCtrl() {
                            canSaveDynamicFields = "0";
@@ -2479,7 +2479,7 @@
                            groupNum = "-1";
                            buttonType = "PushButton";
                            useMouseEvents = "0";
-                           bitmap = "tools/gui/images/delete";
+                           bitmapAsset = "ToolsModule:delete_n_image";
                         };
                      };
                      new GuiBitmapCtrl(){
@@ -2553,7 +2553,7 @@
                            groupNum = "-1";
                            buttonType = "PushButton";
                            useMouseEvents = "0";
-                           bitmap = "tools/materialEditor/gui/cubemapBtnBorder";
+                           bitmapAsset = "ToolsModule:cubemapBtnBorder_n_image";
                         };
                         new GuiTextCtrl() {
                            canSaveDynamicFields = "0";
@@ -2605,7 +2605,7 @@
                            groupNum = "-1";
                            buttonType = "PushButton";
                            useMouseEvents = "0";
-                           bitmap = "tools/gui/images/delete";
+                           bitmapAsset = "ToolsModule:delete_n_image";
                         };
                      };
                   };
@@ -3892,7 +3892,7 @@
                               buttonType = "RadioButton";
                               position = "1 0";
                               Extent = "13 13";
-                              bitmap = "tools/materialEditor/gui/wav-sine";
+                              bitmapAsset = "ToolsModule:wav_sine_n_image";
                               command = "MaterialEditorGui.updateWaveType();";
                               tooltip="Sine Wave";
                               hovertime = "1000";
@@ -3904,7 +3904,7 @@
                               buttonType = "RadioButton";
                               position = "17 0";
                               Extent = "13 13";
-                              bitmap = "tools/materialEditor/gui/wav-triangle";
+                              bitmapAsset = "ToolsModule:wav_triangle_n_image";
                               command = "MaterialEditorGui.updateWaveType();";
                               tooltip="Triangle Wave";
                               hovertime = "1000";
@@ -3916,7 +3916,7 @@
                               buttonType = "RadioButton";
                               position = "33 0";
                               Extent = "13 13";
-                              bitmap = "tools/materialEditor/gui/wav-square";
+                              bitmapAsset = "ToolsModule:wav_square_n_image";
                               command = "MaterialEditorGui.updateWaveType();";
                               tooltip="Square Wave";
                               hovertime = "1000";
@@ -4703,7 +4703,7 @@
             Visible = "0";
             //Command = "materialSelector.showDialog(\"MaterialEditorGui.switchMaterial\");"; 
             hovertime = "1000";
-            bitmap = "tools/gui/images/folderUp";
+            bitmapAsset = "ToolsModule:folderUp_image";
             tooltip = "Go back to previous editor";
             groupNum = "-1";
             buttonType = "PushButton";
@@ -4722,7 +4722,7 @@
             Visible = "1";
             Command = "AssetBrowser.showDialog(\"MaterialAsset\", \"MaterialEditorGui.selectMaterialAsset\");";
             hovertime = "1000";
-            bitmap = "tools/gui/images/open-file";
+            bitmapAsset = "ToolsModule:open_file_n_image";
             tooltip = "Open Existing Material";
             groupNum = "-1";
             buttonType = "PushButton";
@@ -4770,7 +4770,7 @@
             tooltip = "Save Material (ALT S)";
             buttonType = "PushButton";
             useMouseEvents = "0";
-            bitmap = "tools/gui/images/save-icon";
+            bitmapAsset = "ToolsModule:save_icon_n_image";
          };
          new GuiBitmapButtonCtrl() {
             canSaveDynamicFields = "0";
@@ -4791,7 +4791,7 @@
             tooltip = "Lookup Material Instances";
             buttonType = "PushButton";
             useMouseEvents = "0";
-            bitmap = "tools/gui/images/visible";
+            bitmapAsset = "ToolsModule:visible_n_image";
          };
          new GuiBitmapCtrl(){
             position = "147 1";
@@ -4818,7 +4818,7 @@
             hovertime = "1000";
             tooltip = "Revert Material to Saved";
             text = "";
-            bitmap = "tools/gui/images/reset-icon";
+            bitmapAsset = "ToolsModule:reset_icon_n_image";
             groupNum = "-1";
             buttonType = "PushButton";
             useMouseEvents = "0";
@@ -4840,7 +4840,7 @@
             hovertime = "1000";
             tooltip = "Clear All Material Properties";
             text = "";
-            bitmap = "tools/gui/images/clear-icon";
+            bitmapAsset = "ToolsModule:clear_icon_n_image";
             groupNum = "-1";
             buttonType = "PushButton";
             useMouseEvents = "0";
@@ -4862,7 +4862,7 @@
             hovertime = "1000";
             tooltip = "Delete Material from File";
             text = "";
-            bitmap = "tools/gui/images/delete";
+            bitmapAsset = "ToolsModule:delete_n_image";
             groupNum = "-1";
             buttonType = "PushButton";
             useMouseEvents = "0";