Sync changes from upstream repository

Co-authored-by: Andrew Le Bihan <andy@mcneel.com>
Co-authored-by: Dale Fugier <dale@mcneel.com>
Co-authored-by: Dale Lear <dalelear@mcneel.com>
Co-authored-by: David Eränen <deranen@gmail.com>
Co-authored-by: Greg Arden <greg@mcneel.com>
Co-authored-by: Jussi Aaltonen <jussi@mcneel.com>
Co-authored-by: Lowell <lowell@mcneel.com>
Co-authored-by: Mikko Oksanen <mikko@mcneel.com>
Co-authored-by: Pierre Cuvilliers <pierre@mcneel.com>
Co-authored-by: Steve Baer <steve@mcneel.com>
Co-authored-by: chuck <chuck@mcneel.com>
Co-authored-by: piac <giulio@mcneel.com>
Co-authored-by: wfcook <wfcook@mcneel.com>
This commit is contained in:
Bozo The Builder
2021-10-14 07:57:14 -07:00
parent 2b96cf3142
commit 95dde7ec84
50 changed files with 21418 additions and 882 deletions

View File

@@ -596,8 +596,10 @@ ON_OBSOLETE_V5_TextObject* ON_OBSOLETE_V5_TextObject::CreateFromV6TextObject(
if (textgeom->HasWrappedRuns())
{
const ON_wString plaintextFields = textgeom->WrappedPlainTextWithFields();
V5_text_object->SetTextFormula(plaintextFields);
// RH-64471 - WrappedPlainTextWithFields() adds multiple copies of the entire
// text string for each wrapped run.
//const ON_wString plaintextFields = textgeom->WrappedPlainTextWithFields();
//V5_text_object->SetTextFormula(plaintextFields);
const ON_wString plaintext = textgeom->WrappedPlainText();
V5_text_object->SetTextValue(plaintext);
}