lili/opennurbs
1
0
Fork 0
mirror of https://github.com/mcneel/opennurbs.git synced 2026-03-17 06:46:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

Sync changes from upstream repository

Browse Source
This commit is contained in:
Bozo The Builder
2020-09-11 14:29:29 -07:00
parent e15c463638
commit 6a1fea7512
74 changed files with 12912 additions and 3982 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
opennurbs_annotationbase.cpp
View File

@@ -1216,6 +1216,13 @@ bool ON_Annotation::Internal_GetBBox_TextGlyphBox(
text_glyph_box = ON_BoundingBox::UnsetBoundingBox;
if (m_text)
{
ON_Xform txf;
// 20 June 2017 S. Baer (RH-39835)
// GetTextXform can change cached information. Make sure this
// is called before m_text->BoundingBox()
// 23 June, 2020 - Lowell - Moved it above m_text->BoundingBox()
bool b = GetTextXform(vp, dimstyle, dimscale, txf);
text_glyph_box = m_text->BoundingBox();
// if mask, grow 2d bbox
@@ -1232,11 +1239,6 @@ bool ON_Annotation::Internal_GetBBox_TextGlyphBox(
text_glyph_box.m_max = bmax;
}
ON_Xform txf;
// 20 June 2017 S. Baer (RH-39835)
// GetTextXform can change cached information. Make sure this
// is called before m_text->BoundingBox()
bool b = GetTextXform(vp, dimstyle, dimscale, txf);
if (b)
{
text_glyph_box.Transform(txf);