From 76dbedb02ff710871dd69775bfe7dcb92c6f7392 Mon Sep 17 00:00:00 2001
From: AzaezelX <quillus@hotmail.com>
Date: Tue, 21 May 2019 12:03:19 -0500
Subject: [PATCH] reskinning fixes 1) falls back to assuming the word "base" is
 what is to be replaced if no "oldSkin = newSkin" entry exists 2) falls back
 to *using* base if the entry is left entriely blank

---
 Engine/source/T3D/shapeBase.cpp | 47 ++++++++++++++++++++-------------
 Engine/source/T3D/tsStatic.cpp  | 47 ++++++++++++++++++++-------------
 2 files changed, 58 insertions(+), 36 deletions(-)

diff --git a/Engine/source/T3D/shapeBase.cpp b/Engine/source/T3D/shapeBase.cpp
index 3c41564aa..9042f3a82 100644
--- a/Engine/source/T3D/shapeBase.cpp
+++ b/Engine/source/T3D/shapeBase.cpp
@@ -3694,29 +3694,40 @@ void ShapeBase::setSkinName(const char* name)
 
 void ShapeBase::reSkin()
 {
-   if ( isGhost() && mShapeInstance && mSkinNameHandle.isValidString() )
+   if (isGhost() && mShapeInstance)
    {
-	  mShapeInstance->resetMaterialList();
-      Vector<String> skins;
-      String(mSkinNameHandle.getString()).split( ";", skins );
-
-      for (S32 i = 0; i < skins.size(); i++)
+      if (mSkinNameHandle.isValidString())
       {
-         String oldSkin( mAppliedSkinName.c_str() );
-         String newSkin( skins[i] );
+         mShapeInstance->resetMaterialList();
+         Vector<String> skins;
+         String(mSkinNameHandle.getString()).split(";", skins);
 
-         // Check if the skin handle contains an explicit "old" base string. This
-         // allows all models to support skinning, even if they don't follow the 
-         // "base_xxx" material naming convention.
-         S32 split = newSkin.find( '=' );    // "old=new" format skin?
-         if ( split != String::NPos )
+         for (S32 i = 0; i < skins.size(); i++)
          {
-            oldSkin = newSkin.substr( 0, split );
-            newSkin = newSkin.erase( 0, split+1 );
-         }
+            String oldSkin(mAppliedSkinName.c_str());
+            String newSkin(skins[i]);
 
-         mShapeInstance->reSkin( newSkin, oldSkin );
-         mAppliedSkinName = newSkin;
+            // Check if the skin handle contains an explicit "old" base string. This
+            // allows all models to support skinning, even if they don't follow the 
+            // "base_xxx" material naming convention.
+            S32 split = newSkin.find('=');    // "old=new" format skin?
+            if (split != String::NPos)
+            {
+               oldSkin = newSkin.substr(0, split);
+               newSkin = newSkin.erase(0, split + 1);
+            }
+            else
+            {
+               oldSkin = "";
+            }
+            mShapeInstance->reSkin(newSkin, oldSkin);
+            mAppliedSkinName = newSkin;
+         }
+      }
+      else
+      {
+         mShapeInstance->reSkin("", mAppliedSkinName);
+         mAppliedSkinName = "";
       }
    }
 }
diff --git a/Engine/source/T3D/tsStatic.cpp b/Engine/source/T3D/tsStatic.cpp
index e32d395c1..143fadb42 100644
--- a/Engine/source/T3D/tsStatic.cpp
+++ b/Engine/source/T3D/tsStatic.cpp
@@ -542,29 +542,40 @@ void TSStatic::setSkinName( const char *name )
 
 void TSStatic::reSkin()
 {
-   if ( isGhost() && mShapeInstance && mSkinNameHandle.isValidString() )
+   if (isGhost() && mShapeInstance)
    {
-	  mShapeInstance->resetMaterialList();
-      Vector<String> skins;
-      String(mSkinNameHandle.getString()).split( ";", skins );
-
-      for (S32 i = 0; i < skins.size(); i++)
+      if (mSkinNameHandle.isValidString())
       {
-         String oldSkin( mAppliedSkinName.c_str() );
-         String newSkin( skins[i] );
+         mShapeInstance->resetMaterialList();
+         Vector<String> skins;
+         String(mSkinNameHandle.getString()).split(";", skins);
 
-         // Check if the skin handle contains an explicit "old" base string. This
-         // allows all models to support skinning, even if they don't follow the 
-         // "base_xxx" material naming convention.
-         S32 split = newSkin.find( '=' );    // "old=new" format skin?
-         if ( split != String::NPos )
+         for (S32 i = 0; i < skins.size(); i++)
          {
-            oldSkin = newSkin.substr( 0, split );
-            newSkin = newSkin.erase( 0, split+1 );
-         }
+            String oldSkin(mAppliedSkinName.c_str());
+            String newSkin(skins[i]);
 
-         mShapeInstance->reSkin( newSkin, oldSkin );
-         mAppliedSkinName = newSkin;
+            // Check if the skin handle contains an explicit "old" base string. This
+            // allows all models to support skinning, even if they don't follow the 
+            // "base_xxx" material naming convention.
+            S32 split = newSkin.find('=');    // "old=new" format skin?
+            if (split != String::NPos)
+            {
+               oldSkin = newSkin.substr(0, split);
+               newSkin = newSkin.erase(0, split + 1);
+            }
+            else
+            {
+               oldSkin = "";
+            }
+            mShapeInstance->reSkin(newSkin, oldSkin);
+            mAppliedSkinName = newSkin;
+         }
+      }
+      else
+      {
+         mShapeInstance->reSkin("", mAppliedSkinName);
+         mAppliedSkinName = "";
       }
    }
 }