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

Sync changes from upstream repository

Browse Source 
Co-authored-by: croudyj <croudyj@gmail.com>
Co-authored-by: Dale Lear <dalelear@mcneel.com>
Co-authored-by: Greg Arden <greg@mcneel.com>
Co-authored-by: Jussi Aaltonen <jussi@mcneel.com>
Co-authored-by: piac <giulio@mcneel.com>
Co-authored-by: Pierre Cuvilliers <pierre@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-06-27 14:12:47 -07:00
parent 112b5142ba
commit 3c751dd0ea
33 changed files with 2151 additions and 1856 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
opennurbs_3dm_attributes.cpp
View File

@@ -781,7 +781,7 @@ bool ON_3dmObjectAttributes::Internal_ReadV5( ON_BinaryArchive& file )
ON_Color color = ON_Color::UnsetColor;
rc = file.ReadColor(color);
if (!rc) break;
SetHatchBackgrounFillColor(color);
SetHatchBackgroundFillColor(color);
rc = file.ReadChar(&itemid);
if (!rc || 0 == itemid) break;
}
@@ -1989,7 +1989,12 @@ unsigned int ON_3dmObjectAttributes::ApplyParentalControl(
SetSectionAttributesSource(parents_attributes.SectionAttributesSource());
if (ON::SectionAttributesSource::FromLayer == SectionAttributesSource() && parent_layer.Index() >= 0)
{
SetSectionAttributesSource(ON::SectionAttributesSource::FromLayer);
SetSectionAttributesSource(ON::SectionAttributesSource::FromObject);
const ON_SectionStyle* sectionStyle = parent_layer.CustomSectionStyle();
if (sectionStyle)
SetCustomSectionStyle(*sectionStyle);
else
RemoveCustomSectionStyle();
}
else
{
@@ -2446,7 +2451,7 @@ ON_Color ON_3dmObjectAttributes::HatchBackgroundFillColor() const
{
return m_private ? m_private->m_hatch_background_fill : ON_Color::UnsetColor;
}
void ON_3dmObjectAttributes::SetHatchBackgrounFillColor(const ON_Color& color)
void ON_3dmObjectAttributes::SetHatchBackgroundFillColor(const ON_Color& color)
{
ON_Color c = color;
if (c.Alpha() == 255)