Sync changes from upstream repository

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

View File

@@ -5209,6 +5209,11 @@ bool ON_DimStyle::HasOverrides() const
return (m_field_override_parent_count > 0);
}
ON__UINT32 ON_DimStyle::OverrideCount() const
{
return m_field_override_parent_count;
}
void ON_DimStyle::OverrideFields(const ON_DimStyle& source, const ON_DimStyle& parent)
{
if (ParentId() != parent.Id())