Sync changes from upstream repository

This commit is contained in:
Bozo the Builder
2023-11-15 14:18:19 -08:00
parent 92dfe19314
commit 5f656414c0
24 changed files with 878 additions and 293 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();
}
}