Sync changes from upstream repository

Co-authored-by: croudyj <croudyj@gmail.com>
Co-authored-by: Dale Fugier <dale@mcneel.com>
Co-authored-by: Dan Rigdon-Bel <dan@mcneel.com>
Co-authored-by: kike-garbo <kike@mcneel.com>
Co-authored-by: piac <giulio@mcneel.com>
Co-authored-by: Pierre Cuvilliers <pierre@mcneel.com>
This commit is contained in:
Bozo The Builder
2022-08-12 10:22:45 -07:00
parent e68e534842
commit 679770e15c
29 changed files with 608 additions and 294 deletions

View File

@@ -446,7 +446,10 @@ bool ON_SubDComponentRef::GetBBox(
switch (m_component_ptr.ComponentType())
{
case ON_SubDComponentPtr::Type::Vertex:
case ON_SubDComponentPtr::Type::Unset:
break;
case ON_SubDComponentPtr::Type::Vertex:
{
const ON_SubDVertex* vertex = m_component_ptr.Vertex();
if ( nullptr == vertex )
@@ -458,6 +461,9 @@ bool ON_SubDComponentRef::GetBBox(
case ON_SubDComponentLocation::ControlNet:
bbox = vertex->ControlNetBoundingBox();
break;
case ON_SubDComponentLocation::Unset:
break;
}
}
break;
@@ -473,6 +479,8 @@ bool ON_SubDComponentRef::GetBBox(
case ON_SubDComponentLocation::ControlNet:
bbox = edge->ControlNetBoundingBox();
break;
case ON_SubDComponentLocation::Unset:
break;
}
}
break;
@@ -488,6 +496,8 @@ bool ON_SubDComponentRef::GetBBox(
case ON_SubDComponentLocation::ControlNet:
bbox = face->ControlNetBoundingBox();
break;
case ON_SubDComponentLocation::Unset:
break;
}
}
break;
@@ -582,7 +592,10 @@ bool ON_SubDComponentRefList::Internal_UpdateCount(const ON_SubDComponentRef& r,
ON_SubDComponentPtr cptr = r.ComponentPtr();
switch (cptr.ComponentType())
{
case ON_SubDComponentPtr::Type::Vertex:
case ON_SubDComponentPtr::Type::Unset:
break;
case ON_SubDComponentPtr::Type::Vertex:
{
const ON_SubDVertex* v = cptr.Vertex();
if (nullptr == v)
@@ -605,6 +618,8 @@ bool ON_SubDComponentRefList::Internal_UpdateCount(const ON_SubDComponentRef& r,
m_subd_vertex_dart_count += i;
rc = true;
break;
case ON_SubDVertexTag::Unset:
break;
}
}
break;
@@ -625,6 +640,8 @@ bool ON_SubDComponentRefList::Internal_UpdateCount(const ON_SubDComponentRef& r,
m_subd_edge_crease_count += i;
rc = true;
break;
case ON_SubDEdgeTag::Unset:
break;
}
}
break;
@@ -856,6 +873,8 @@ int ON_SubDComponentRefList::VertexCount(ON_SubDVertexTag vertex_tag) const
case ON_SubDVertexTag::Dart:
c = m_subd_vertex_dart_count;
break;
case ON_SubDVertexTag::Unset:
break;
}
return c;
@@ -879,6 +898,8 @@ int ON_SubDComponentRefList::EdgeCount(ON_SubDEdgeTag edge_tag) const
case ON_SubDEdgeTag::Crease:
c = m_subd_edge_crease_count;
break;
case ON_SubDEdgeTag::SmoothX:
break;
}
return c;
}