Sync changes from upstream repository

Co-authored-by: Steve Baer <steve@mcneel.com>
Co-authored-by: Nathan Letwory <nathan@mcneel.com>
Co-authored-by: Dale Lear <dalelear@mcneel.com>
This commit is contained in:
Bozo The Builder
2019-11-05 18:13:55 -08:00
committed by Will Pearson
parent b844466e88
commit 799431a63b
130 changed files with 29557 additions and 9236 deletions

View File

@@ -16,7 +16,6 @@ ON_Terminator::ON_Terminator()
m_reserved1[3] = false;
m_reserved1[4] = false;
m_reserved1[5] = false;
m_reserved1[6] = false;
m_reserved2[0] = 0;
m_reserved2[1] = 0;
}
@@ -84,6 +83,16 @@ bool ON_Terminator::TerminationRequested( ON_Terminator* terminator )
return TerminationRequestedExpert( terminator, CLOCKS_PER_SEC/10 );
}
void ON_Terminator::SetAllowDefaultCancellationHandling(bool bAllow)
{
m_bAllowDefaultCancellationHandling = bAllow;
}
bool ON_Terminator::AllowDefaultCancellationHandling(void) const
{
return m_bAllowDefaultCancellationHandling;
}
bool ON_Terminator::TerminationRequestedExpert(
ON_Terminator* terminator,
ON__UINT64 callback_delta