com.unity.textmeshpro@2.1.1

## [2.1.1] - 2020-07-26

Author: Unity Technologies

CHANGELOG.md

@@ -1,6 +1,17 @@
 # Changelog
 These are the release notes for the TextMesh Pro UPM package which was first introduced with Unity 2018.1. Please see the following link for the Release Notes for prior versions of TextMesh Pro. http://digitalnativestudios.com/forum/index.php?topic=1363.0
 
+## [2.1.1] - 2020-07-26
+## [1.5.1]
+## [3.0.1]
+### Changes
+- Addressed compiler warning related to the new virtual event OnPreRenderText.
+- Added one additional layer of missing character search where in the even the missing glyph character \u0000 or space character \u0020 is not available in any font asset or potential fallbacks, the End of Text (ETX) \u0003 will be used instead.
+- Input Field Integer or Decimal validation will now take into account the current culture. See [forum post](https://forum.unity.com/threads/currentculture-decimal-separator-in-input-fields.908999/) for details.
+- Added Editor only font asset post processor to handle font assets being modified outside of the Unity Editor.
+- Fixed potential Array Out of Bounds error that could occur when using </style> without first using a valid <style>. Case #1263787 and See [forum post](https://forum.unity.com/threads/missingreferenceexception-occurs-on-selecting-a-tmp-dropdown-in-the-hierarchy-after-a-play-occurs.728018/#post-6094317) for details.
+- Fixed potential issue when using multiple <font> tag in the same text object where these referencing several font assets derived from the same font file. Since their Default Material all have the same name, this was causing an issue in the Material Reference Manager. See [forum post](https://forum.unity.com/threads/argumentexception-on-v2-1-0-unity-2019-4-4f1-identified-bug.934789/) for details. Case #1264596. 
+
 ## [2.1.0] - 2020-06-30
 ## [1.5.0]
 ## [3.0.0]

Scripts/Editor/TMPro_FontAssetCreatorWindow.cs

@@ -936,7 +936,6 @@ void DrawControls()
                             m_StopWatch.Stop();
                             m_GlyphPackingGenerationTime = m_StopWatch.Elapsed.TotalMilliseconds;
                             m_IsGlyphPackingDone = true;
-                            //Debug.Log("Glyph packing completed in: " + m_GlyphPackingGenerationTime.ToString("0.000 ms."));
                             m_StopWatch.Reset();
 
                             m_FontCharacterTable.Clear();
@@ -1003,7 +1002,6 @@ void DrawControls()
                             m_StopWatch.Stop();
                             m_GlyphRenderingGenerationTime = m_StopWatch.Elapsed.TotalMilliseconds;
                             m_IsGlyphRenderingDone = true;
-                            //Debug.Log("Font Atlas generation completed in: " + m_GlyphRenderingGenerationTime.ToString("0.000 ms."));
                             m_StopWatch.Reset();
                         });
                     }

Scripts/Editor/TMPro_TexturePostProcessor.cs

@@ -1,4 +1,5 @@
-using UnityEngine;
+using System;
+using UnityEngine;
 using UnityEditor;
 using System.Collections;
 
@@ -8,20 +9,35 @@ namespace TMPro.EditorUtilities
 
     public class TMPro_TexturePostProcessor : AssetPostprocessor
     {
-
         void OnPostprocessTexture(Texture2D texture)
         {
-            //var importer = assetImporter as TextureImporter;
-
             Texture2D tex = AssetDatabase.LoadAssetAtPath(assetPath, typeof(Texture2D)) as Texture2D;
 
             // Send Event Sub Objects
             if (tex != null)
                 TMPro_EventManager.ON_SPRITE_ASSET_PROPERTY_CHANGED(true, tex);
         }
-
     }
 
+    /// <summary>
+    /// Asset post processor used to handle font assets getting updated outside of the Unity editor.
+    /// </summary>
+    class FontAssetPostProcessor : AssetPostprocessor
+    {
+        private static void OnPostprocessAllAssets(string[] importedAssets, string[] deletedAssets, string[] movedAssets, string[] movedFromAssetPaths)
+        {
+            foreach (var asset in importedAssets)
+            {
+                if (AssetDatabase.GetMainAssetTypeAtPath(asset) == typeof(TMP_FontAsset))
+                {
+                    TMP_FontAsset fontAsset = AssetDatabase.LoadAssetAtPath(asset, typeof(TMP_FontAsset)) as TMP_FontAsset;
+
+                    if (fontAsset != null)
+                        TMP_EditorResourceManager.RegisterFontAssetForDefinitionRefresh(fontAsset);
+                }
+            }
+        }
+    }
 
     //public class TMPro_PackageImportPostProcessor : AssetPostprocessor
     //{
@@ -34,7 +50,7 @@ void OnPostprocessTexture(Texture2D texture)
     //                Debug.Log("New TMP Settings file was just imported.");
 
     //                // TMP Settings file was just re-imported.
-    //                // Check if project already contains 
+    //                // Check if project already contains
     //            }
 
 
@@ -45,9 +61,9 @@ void OnPostprocessTexture(Texture2D texture)
 
     //            //Debug.Log("[" + importedAssets[i] + "] was just imported.");
     //        }
-            
-            
-            
+
+
+
     //        //for (int i = 0; i < deletedAssets.Length; i++)
     //        //{
     //        //    if (deletedAssets[i] == "Assets/TextMesh Pro")
@@ -72,4 +88,4 @@ void OnPostprocessTexture(Texture2D texture)
     //        //}
     //    }
     //}
-}
+}

Scripts/Runtime/TMP_CharacterInfo.cs

@@ -1,5 +1,6 @@
-using UnityEngine;
-using UnityEngine.TextCore;
+using System.Diagnostics;
+using UnityEngine;
+
 
 namespace TMPro
 {
@@ -157,6 +158,7 @@ public bool Equals(HighlightState other)
     /// <summary>
     /// Structure containing information about individual text elements (character or sprites).
     /// </summary>
+    [DebuggerDisplay("Unicode '{character}'  ({((uint)character).ToString(\"X\")})")]
     public struct TMP_CharacterInfo
     {
         public char character; // Should be changed to an uint to handle UTF32

Scripts/Runtime/TMP_EditorResourceManager.cs

@@ -17,6 +17,9 @@ public class TMP_EditorResourceManager
         private readonly List<Object> m_ObjectReImportQueue = new List<Object>();
         private HashSet<int> m_ObjectReImportQueueLookup = new HashSet<int>();
 
+        private readonly List<TMP_FontAsset> m_FontAssetDefinitionRefreshQueue = new List<TMP_FontAsset>();
+        private HashSet<int> m_FontAssetDefinitionRefreshQueueLookup = new HashSet<int>();
+
         /// <summary>
         /// Get a singleton instance of the manager.
         /// </summary>
@@ -67,8 +70,6 @@ private void InternalRegisterResourceForReimport(Object obj)
 
             m_ObjectReImportQueueLookup.Add(id);
             m_ObjectReImportQueue.Add(obj);
-
-            return;
         }
 
         /// <summary>
@@ -89,8 +90,26 @@ private void InternalRegisterResourceForUpdate(Object obj)
 
             m_ObjectUpdateQueueLookup.Add(id);
             m_ObjectUpdateQueue.Add(obj);
+        }
 
-            return;
+        /// <summary>
+        ///
+        /// </summary>
+        /// <param name="fontAsset"></param>
+        internal static void RegisterFontAssetForDefinitionRefresh(TMP_FontAsset fontAsset)
+        {
+            instance.InternalRegisterFontAssetForDefinitionRefresh(fontAsset);
+        }
+
+        private void InternalRegisterFontAssetForDefinitionRefresh(TMP_FontAsset fontAsset)
+        {
+            int id = fontAsset.GetInstanceID();
+
+            if (m_FontAssetDefinitionRefreshQueueLookup.Contains(id))
+                return;
+
+            m_FontAssetDefinitionRefreshQueueLookup.Add(id);
+            m_FontAssetDefinitionRefreshQueue.Add(fontAsset);
         }
 
 
@@ -135,6 +154,24 @@ void DoUpdates()
                 m_ObjectReImportQueue.Clear();
                 m_ObjectReImportQueueLookup.Clear();
             }
+
+            // Handle Font Asset Definition Refresh
+            for (int i = 0; i < m_FontAssetDefinitionRefreshQueue.Count; i++)
+            {
+                TMP_FontAsset fontAsset = m_FontAssetDefinitionRefreshQueue[i];
+
+                if (fontAsset != null)
+                {
+                    fontAsset.ReadFontAssetDefinition();
+                    TMPro_EventManager.ON_FONT_PROPERTY_CHANGED(true, fontAsset);
+                }
+            }
+
+            if (m_FontAssetDefinitionRefreshQueue.Count > 0)
+            {
+                m_FontAssetDefinitionRefreshQueue.Clear();
+                m_FontAssetDefinitionRefreshQueueLookup.Clear();
+            }
         }
 
     }

Scripts/Runtime/TMP_FontAsset.cs

@@ -538,6 +538,8 @@ private void OnValidate()
         }
         #endif
 
+        private static string s_DefaultMaterialSuffix = " Atlas Material";
+
         public void ReadFontAssetDefinition()
         {
             Profiler.BeginSample("TMP.ReadFontAssetDefinition");
@@ -573,7 +575,7 @@ public void ReadFontAssetDefinition()
             hashCode = TMP_TextUtilities.GetSimpleHashCode(this.name);
 
             // Compute Hashcode for the material name
-            materialHashCode = TMP_TextUtilities.GetSimpleHashCode(material.name);
+            materialHashCode = TMP_TextUtilities.GetSimpleHashCode(this.name + s_DefaultMaterialSuffix);
 
             // Add reference to font asset in TMP Resource Manager
             //TMP_ResourceManager.AddFontAsset(this);

Scripts/Runtime/TMP_FontFeaturesCommon.cs

@@ -7,6 +7,7 @@
 
 namespace TMPro
 {
+    [Flags]
     public enum FontFeatureLookupFlags
     {
         None                        =     0x0,
@@ -161,7 +162,7 @@ public class TMP_GlyphPairAdjustmentRecord
         public TMP_GlyphAdjustmentRecord secondAdjustmentRecord { get { return m_SecondAdjustmentRecord; } set { m_SecondAdjustmentRecord = value; } }
 
         /// <summary>
-        /// 
+        ///
         /// </summary>
         public FontFeatureLookupFlags featureLookupFlags { get { return m_FeatureLookupFlags; } set { m_FeatureLookupFlags = value; } }
 
@@ -191,7 +192,7 @@ public TMP_GlyphPairAdjustmentRecord(TMP_GlyphAdjustmentRecord firstAdjustmentRe
         }
 
         /// <summary>
-        /// Internal constructor 
+        /// Internal constructor
         /// </summary>
         /// <param name="firstAdjustmentRecord"></param>
         /// <param name="secondAdjustmentRecord"></param>

Scripts/Runtime/TMP_InputField.cs

@@ -3,6 +3,7 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.Threading;
 using System.Text;
 using System.Text.RegularExpressions;
 using UnityEngine;
@@ -3827,7 +3828,9 @@ protected char Validate(string text, int pos, char ch)
                 {
                     if (ch >= '0' && ch <= '9') return ch;
                     if (ch == '-' && (pos == 0 || selectionAtStart)) return ch;
-                    if (ch == '.' && characterValidation == CharacterValidation.Decimal && !text.Contains(".")) return ch;
+
+                    var separator = Thread.CurrentThread.CurrentCulture.NumberFormat.NumberDecimalSeparator;
+                    if (ch == Convert.ToChar(separator) && characterValidation == CharacterValidation.Decimal && !text.Contains(separator)) return ch;
                 }
             }
             else if (characterValidation == CharacterValidation.Digit)