mirror of
https://github.com/mcneel/opennurbs.git
synced 2026-03-06 15:05:52 +08:00
Sync changes from upstream repository
Co-authored-by: Andrew Le Bihan <andy@mcneel.com> Co-authored-by: croudyj <croudyj@gmail.com> Co-authored-by: Dale Lear <dalelear@mcneel.com> Co-authored-by: Greg Arden <greg-arden@users.noreply.github.com> Co-authored-by: Pierre Cuvilliers <pierre@mcneel.com> Co-authored-by: Steve Baer <steve@mcneel.com>
This commit is contained in:
@@ -2529,22 +2529,20 @@ ON_Decal* ON_3dmObjectAttributes::AddDecal(void)
|
||||
return m_private->m_decals.AddDecal();
|
||||
}
|
||||
|
||||
bool ON_3dmObjectAttributes::DeleteDecal(ON_Decal& decal)
|
||||
bool ON_3dmObjectAttributes::RemoveDecal(ON_Decal& decal)
|
||||
{
|
||||
if (nullptr == m_private)
|
||||
m_private = new ON_3dmObjectAttributesPrivate(this);
|
||||
|
||||
return m_private->m_decals.DeleteDecal(decal);
|
||||
return m_private->m_decals.RemoveDecal(decal);
|
||||
}
|
||||
|
||||
void ON_3dmObjectAttributes::DeleteAllDecals(void)
|
||||
void ON_3dmObjectAttributes::RemoveAllDecals(void)
|
||||
{
|
||||
//if (nullptr == m_private)
|
||||
// m_private = new ON_3dmObjectAttributesPrivate(this);
|
||||
if (nullptr == m_private)
|
||||
m_private = new ON_3dmObjectAttributesPrivate(this);
|
||||
|
||||
// Delete all the user data? [JOHN-DECAL-FIX]
|
||||
// TODO:
|
||||
// return m_private->m_decals.DeleteAllDecals();
|
||||
return m_private->m_decals.RemoveAllDecals();
|
||||
}
|
||||
|
||||
// {1403A7E4-E7AD-4a01-A2AA-41DAE6BE7ECB}
|
||||
|
||||
Reference in New Issue
Block a user