Skip to content

Commit

Permalink
com.unity.textmeshpro@1.5.0-preview.11
Browse files Browse the repository at this point in the history
## [1.5.0-preview.11] - 2020-04-22
## [2.1.0-preview.11]
## [3.0.0-preview.11]
### Changes
- Fixed incorrect culling of text object by RectMask2D component when the parent Canvas Render Mode is set to Screen Space - Camera or World Space. Case #1240595
- Added special handling to ForceMeshUpdate() when the parent Canvas is disabled.
  • Loading branch information
Unity Technologies committed Apr 21, 2020
1 parent 4700481 commit 45f7472
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 4 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
# 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

## [1.5.0-preview.11] - 2020-04-22
## [2.1.0-preview.11]
## [3.0.0-preview.11]
### Changes
- Fixed incorrect culling of text object by RectMask2D component when the parent Canvas Render Mode is set to Screen Space - Camera or World Space. Case #1240595
- Added special handling to ForceMeshUpdate() when the parent Canvas is disabled.

## [1.5.0-preview.10] - 2020-04-21
## [2.1.0-preview.10]
## [3.0.0-preview.10]
Expand Down
4 changes: 3 additions & 1 deletion Scripts/Runtime/TMPro_UGUI_Private.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4499,7 +4499,9 @@ internal override Rect GetCanvasSpaceClippingRect()
Transform rootCanvasTransform = m_canvas.rootCanvas.transform;
Bounds compoundBounds = GetCompoundBounds();

return new Rect(rootCanvasTransform.InverseTransformPoint(m_rectTransform.position + compoundBounds.min), compoundBounds.size);
Vector3 position = rootCanvasTransform.InverseTransformPoint(m_rectTransform.position);

return new Rect(position + compoundBounds.min, compoundBounds.size);
}


Expand Down
5 changes: 5 additions & 0 deletions Scripts/Runtime/TextMeshProUGUI.cs
Original file line number Diff line number Diff line change
Expand Up @@ -505,6 +505,11 @@ public override void ForceMeshUpdate(bool ignoreActiveState = false, bool forceT
m_havePropertiesChanged = true;
m_ignoreActiveState = ignoreActiveState;
m_isInputParsingRequired = m_isInputParsingRequired ? true : forceTextReparsing;

// Special handling in the event the Canvas is only disabled
if (m_canvas == null)
m_canvas = GetComponentInParent<Canvas>();

OnPreRenderCanvas();
}

Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "com.unity.textmeshpro",
"displayName": "TextMeshPro",
"version": "1.5.0-preview.10",
"version": "1.5.0-preview.11",
"unity": "2018.3",
"description": "TextMeshPro is the ultimate text solution for Unity. It's the perfect replacement for Unity's UI Text and the legacy Text Mesh.\n\nPowerful and easy to use, TextMeshPro (also known as TMP) uses Advanced Text Rendering techniques along with a set of custom shaders; delivering substantial visual quality improvements while giving users incredible flexibility when it comes to text styling and texturing.\n\nTextMeshPro provides Improved Control over text formatting and layout with features like character, word, line and paragraph spacing, kerning, justified text, Links, over 30 Rich Text Tags available, support for Multi Font & Sprites, Custom Styles and more.\n\nGreat performance. Since the geometry created by TextMeshPro uses two triangles per character just like Unity's text components, this improved visual quality and flexibility comes at no additional performance cost.",
"keywords": [
Expand All @@ -16,9 +16,9 @@
"repository": {
"type": "git",
"url": "https://github.cds.internal.unity3d.com/unity/com.unity.textmeshpro.git",
"revision": "74330e3ce2eb0fa4718f0a94c392d2ba457f48c0"
"revision": "ee8ff60ea162f08134b77b00c077268396934db2"
},
"upmCi": {
"footprint": "8a04ffb570a20d31883438eeaa26629c904e0b23"
"footprint": "f23115e24251a31330c02aee7a3d352cad80027e"
}
}

0 comments on commit 45f7472

Please sign in to comment.