Sync changes from upstream repository

Co-authored-by: Andrew Le Bihan <andy@mcneel.com>
Co-authored-by: chuck <chuck@mcneel.com>
Co-authored-by: Dale Fugier <dale@mcneel.com>
Co-authored-by: Dale Lear <dalelear@mcneel.com>
Co-authored-by: David Eränen <david.eranen@mcneel.com>
Co-authored-by: Greg Arden <greg@mcneel.com>
Co-authored-by: John Croudy <john.croudy@mcneel.com>
Co-authored-by: Lowell Walmsley <lowell@mcneel.com>
Co-authored-by: Nathan Letwory <nathan@mcneel.com>
Co-authored-by: piac <giulio@mcneel.com>
Co-authored-by: Steve Baer <steve@mcneel.com>
Co-authored-by: Tim Hemmelman <tim@mcneel.com>
This commit is contained in:
Bozo The Builder
2020-03-12 09:00:26 -07:00
parent acbc998a03
commit 01cdb463e6
50 changed files with 5774 additions and 1857 deletions

View File

@@ -1616,7 +1616,7 @@ ON_Mesh* ON_SubD::GetControlNetMesh(
const ON_SubDVertex* vertex = face->Vertex(0);
meshf.vi[1] = (nullptr != vertex) ? vertex->ArchiveId() : 0;
if (meshf.vi[1] < 1 || meshf.vi[1] >= (int)subd_vertex_count)
if (meshf.vi[1] < 1 || meshf.vi[1] > (int)subd_vertex_count)
continue;
meshf.vi[1]--;
@@ -1731,7 +1731,7 @@ void ON_SubD::ClearEvaluationCache() const
if (nullptr != level)
{
const_cast<ON_SubD*>(this)->ChangeContentSerialNumberForExperts();
const_cast<ON_SubD*>(this)->ChangeContentSerialNumberForExperts(false);
level->ClearEvaluationCache();
}
}
@@ -1742,7 +1742,7 @@ void ON_SubD::ClearNeighborhoodEvaluationCache(const ON_SubDVertex * vertex, boo
if (nullptr != level)
{
const_cast<ON_SubD*>(this)->ChangeContentSerialNumberForExperts();
const_cast<ON_SubD*>(this)->ChangeContentSerialNumberForExperts(false);
level->ClearNeighborhoodEvaluationCache(vertex, bTagChanged);
}
}