Sync changes from upstream repository

Co-authored-by: Bozo <bozo@mcneel.com>
Co-authored-by: croudyj <croudyj@gmail.com>
Co-authored-by: Dale Fugier <dale@mcneel.com>
Co-authored-by: Dale Lear <dalelear@mcneel.com>
Co-authored-by: Greg Arden <greg@mcneel.com>
Co-authored-by: jlasor <jeff@mcneel.com>
Co-authored-by: Mikko Oksanen <mikko@mcneel.com>
Co-authored-by: piac <giulio@mcneel.com>
Co-authored-by: Pierre Cuvilliers <pierre@mcneel.com>
Co-authored-by: Rafael Pastrana <arpj@princeton.edu>
Co-authored-by: Steve Baer <steve@mcneel.com>
This commit is contained in:
Bozo the Builder
2023-11-15 13:26:37 -08:00
parent 052b5c981c
commit 417d739f1b
29 changed files with 1109 additions and 322 deletions

View File

@@ -256,16 +256,16 @@ const ON_MappingTag ON_SubDimple::TextureMappingTag(bool bIgnoreTextureCoordinat
#pragma endregion
#endif
const ON_MappingTag ON_SubDimple::FragmentColorsMappingTag() const
const ON_MappingTag ON_SubDimple::ColorsMappingTag() const
{
return m_fragment_colors_mapping_tag;
return m_colors_mapping_tag;
}
void ON_SubDimple::SetFragmentColorsMappingTag(const ON_MappingTag& mapping_tag) const
void ON_SubDimple::SetColorsMappingTag(const ON_MappingTag& mapping_tag) const
{
if (0 != ON_MappingTag::CompareAll(this->m_fragment_colors_mapping_tag, mapping_tag))
if (0 != ON_MappingTag::CompareAll(this->m_colors_mapping_tag, mapping_tag))
{
this->m_fragment_colors_mapping_tag = mapping_tag;
this->m_colors_mapping_tag = mapping_tag;
ChangeRenderContentSerialNumber();
}
}