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

Sync changes from upstream repository

Browse Source 
Co-authored-by: Andrew le Bihan <andy@mcneel.com>
Co-authored-by: Brian Gillespie <brian@mcneel.com>
Co-authored-by: Dale Lear <dalelear@mcneel.com>
Co-authored-by: Giulio Piacentino <giulio@mcneel.com>
Co-authored-by: Greg Arden <greg@mcneel.com>
Co-authored-by: Lars <lars@mcneel.com>
Co-authored-by: Lowell <lowell@mcneelcom>
Co-authored-by: Nathan Letwory <nathan@mcneel.com>
Co-authored-by: Pierre Cuvilliers <pierre@mcneel.com>
Co-authored-by: Tim Hemmelman <tim@mcneel.com>
This commit is contained in:
Bozo The Builder
2020-12-16 05:49:44 -08:00
parent 990401a8f5
commit 488533eb7a
54 changed files with 4026 additions and 898 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
opennurbs_annotationbase.cpp
View File

@@ -158,8 +158,16 @@ static bool Internal_UpdateOverrideCandidateParentId(
{
for (;;)
{
if (0 == archive.ReferenceModelSerialNumber() && 0 == archive.InstanceDefinitionModelSerialNumber())
if (
false == archive.CheckForRemappedIds()
&& 0 == archive.ReferenceModelSerialNumber()
&& 0 == archive.InstanceDefinitionModelSerialNumber()
)
{
return false; // common situation - no change reqired
}
if (nullptr == override_candidate)
break;
const ON_UUID archive_parent_id = override_candidate->ParentId();
@@ -812,11 +820,23 @@ bool ON_Annotation::IsOverrideStylePointer(
bool ON_Annotation::AllowTextScaling() const
{
// These functions are being added to continue the V5 behavior of
// per-object text scaling. There is no user interface
// in V6 or V7 that shows this setting or that allows a user
// to change this setting.
// AllowTextScaling() = false means the effective dimstyle value
// of DimScale() (model space scale factor) is ignored (treated as if it were 1).
return m_allow_text_scaling;
}
void ON_Annotation::SetAllowTextScaling(bool scale)
{
// These functions are being added to continue the V5 behavior of
// per-object text scaling. There is no user interface
// in V6 or V7 that shows this setting or that allows a user
// to change this setting.
// AllowTextScaling() = false means the effective dimstyle value
// of DimScale() (model space scale factor) is ignored (treated as if it were 1).
if (scale != m_allow_text_scaling)
{
m_allow_text_scaling = scale ? true : false;