mirror of
https://github.com/mcneel/opennurbs.git
synced 2026-03-17 06:46:01 +08:00
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:
committed by
Will Pearson
parent
b844466e88
commit
799431a63b
@@ -283,8 +283,12 @@ unsigned int ON_ComponentStatus::ClearStates(
|
||||
s1 &= ~HIGHLIGHTED_BIT;
|
||||
}
|
||||
|
||||
// preserve value of runtime mark bit on m_status_flags
|
||||
const unsigned char mark = (m_status_flags&RUNTIME_MARK_BIT);
|
||||
|
||||
// change m_status_flags to new value
|
||||
m_status_flags = (s1|mark);
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
@@ -388,33 +392,33 @@ bool ON_ComponentStatus::RuntimeMark() const
|
||||
|
||||
}
|
||||
|
||||
unsigned int ON_ComponentStatus::SetRuntimeMark(
|
||||
bool ON_ComponentStatus::SetRuntimeMark(
|
||||
bool bRuntimeMark
|
||||
)
|
||||
{
|
||||
return bRuntimeMark ? SetRuntimeMark() : ClearRuntimeMark();
|
||||
}
|
||||
|
||||
unsigned int ON_ComponentStatus::SetRuntimeMark()
|
||||
bool ON_ComponentStatus::SetRuntimeMark()
|
||||
{
|
||||
const unsigned char c = (m_status_flags | RUNTIME_MARK_BIT);
|
||||
if (c != m_status_flags)
|
||||
{
|
||||
m_status_flags = c;
|
||||
return 1;
|
||||
return true;
|
||||
}
|
||||
return 0;
|
||||
return false;
|
||||
}
|
||||
|
||||
unsigned int ON_ComponentStatus::ClearRuntimeMark()
|
||||
bool ON_ComponentStatus::ClearRuntimeMark()
|
||||
{
|
||||
const unsigned char c = (m_status_flags & ~RUNTIME_MARK_BIT);
|
||||
if (c != m_status_flags)
|
||||
{
|
||||
m_status_flags = c;
|
||||
return 1;
|
||||
return true;
|
||||
}
|
||||
return 0;
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user