Sync changes from upstream repository

Co-authored-by: Andrew Le Bihan <andy@mcneel.com>
Co-authored-by: croudyj <croudyj@gmail.com>
Co-authored-by: Dale Lear <dalelear@mcneel.com>
Co-authored-by: David Eränen <david.eranen@mcneel.com>
Co-authored-by: Giulio Piacentino <giulio@mcneel.com>
Co-authored-by: Greg Arden <greg@mcneel.com>
Co-authored-by: Jussi Aaltonen <jussi@mcneel.com>
Co-authored-by: kike-garbo <kike@mcneel.com>
Co-authored-by: Mikko Oksanen <mikko@mcneel.com>
Co-authored-by: Pierre Cuvilliers <pierre@mcneel.com>
Co-authored-by: sodermax <max.soderstrom@mcneel.com>
Co-authored-by: steve <steve@mcneel.com>
Co-authored-by: Steve Baer <steve@mcneel.com>
Co-authored-by: Will Pearson <will@mcneel.com>
This commit is contained in:
Bozo The Builder
2023-02-23 16:10:31 -08:00
parent e88525df92
commit 6c3cec9905
50 changed files with 3748 additions and 1022 deletions

View File

@@ -1456,6 +1456,13 @@ bool ON_3dmObjectAttributes::Write( ON_BinaryArchive& file ) const
case ON::no_space: uc = 0; break;
case ON::model_space: uc = 0; break;
case ON::page_space: uc = 1; break;
case ON::uveditor_space:
case ON::blockeditor_space:
{
uc = 2;
ON_ASSERT(false);
break;
}
}
rc = file.WriteChar(uc);
}
@@ -1517,14 +1524,13 @@ bool ON_3dmObjectAttributes::Transform(const ON_Geometry* pOriginalGeometry, con
{
m_object_frame.Transform(xform);
}
else if (pOriginalGeometry)
/*else if (pOriginalGeometry)
{
ON_Plane plane = ON_Plane::World_xy;
plane.SetOrigin(pOriginalGeometry->BoundingBox().Center());
SetObjectFrame(ON_COMPONENT_INDEX::WholeObject, plane);
m_object_frame.Transform(xform);
}
}*/
return m_rendering_attributes.Transform(xform);
}