Fix changes to tongue and teeth parts not being reset on changing cha…

…racters in AI and HS2
IllusionMods · Dec 2, 2021 · c13a3d6 · c13a3d6
1 parent c4e1ddb
commit c13a3d6
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/src/MaterialEditor.Core/Core.MaterialEditor.CharaController.cs b/src/MaterialEditor.Core/Core.MaterialEditor.CharaController.cs
@@ -668,7 +668,7 @@ private void CorrectTongue()
             if (!ChaControl.hiPoly) return;
 #endif
 
-#if KK || EC || KKS
+#if KK || EC || KKS || AI || HS2
             //Get the tongue material used by the head since this one is properly refreshed with every character reload
             Material tongueMat = null;
             foreach (var renderer in GetRendererList(ChaControl.objHead.gameObject))

diff --git a/src/MaterialEditor.Core/Core.MaterialEditor.Hooks.cs b/src/MaterialEditor.Core/Core.MaterialEditor.Hooks.cs
@@ -127,7 +127,7 @@ private static void MaterialAPI_GetRendererList_Postfix(ref IEnumerable<Renderer
         private static bool MaterialAPI_GetMaterials(ref IEnumerable<Material> __result, GameObject gameObject, Renderer renderer)
         {
             //Must use sharedMaterials for character objects or it breaks body masks, etc.
-#if KK || EC || KKS
+#if KK || EC || KKS || AI || HS2
             if (gameObject.GetComponent<ChaControl>() && !MaterialEditorPlugin.MouthParts.Contains(renderer.NameFormatted()))
 #else
             if (gameObject.GetComponent<ChaControl>())
@@ -144,7 +144,7 @@ private static bool MaterialAPI_GetMaterials(ref IEnumerable<Material> __result,
         private static bool MaterialAPI_SetMaterials(GameObject gameObject, Renderer renderer, Material[] materials)
         {
             //Must use sharedMaterials for character objects or it breaks body masks, etc.
-#if KK || EC || KKS
+#if KK || EC || KKS || AI || HS2
             if (gameObject.GetComponent<ChaControl>() && !MaterialEditorPlugin.MouthParts.Contains(renderer.NameFormatted()))
 #else
             if (gameObject.GetComponent<ChaControl>())

diff --git a/src/MaterialEditor.Core/Core.MaterialEditor.cs b/src/MaterialEditor.Core/Core.MaterialEditor.cs
@@ -58,7 +58,7 @@ public partial class MaterialEditorPlugin : MaterialEditorAPI.MaterialEditorPlug
         /// <summary>
         /// MaterialEditor plugin version
         /// </summary>
-        public const string PluginVersion = "3.1.10";
+        public const string PluginVersion = "3.1.11";
 
         /// <summary>
         /// Material which is used in normal map conversion
@@ -117,6 +117,11 @@ public partial class MaterialEditorPlugin : MaterialEditorAPI.MaterialEditorPlug
         /// Parts of the mouth that need special handling
         /// </summary>
         public static HashSet<string> MouthParts = new HashSet<string> { "cf_O_tooth", "cf_O_canine", "cf_O_tang", "o_tang", "n_tang" };
+#elif AI || HS2
+        /// <summary>
+        /// Parts of the mouth that need special handling
+        /// </summary>
+        public static HashSet<string> MouthParts = new HashSet<string> { "o_tooth", "o_tang" };
 #endif
 
         internal void Main()