Sync changes from upstream repository

This commit is contained in:
Bozo The Builder
2020-09-11 14:29:29 -07:00
parent e15c463638
commit 6a1fea7512
74 changed files with 12912 additions and 3982 deletions

View File

@@ -919,7 +919,7 @@ ON_Object* ON_BinaryArchive::Internal_ConvertObject(
ON_Mesh* mesh = nullptr;
if ( Archive3dmVersion() < 60 )
{
mesh = subd->GetControlNetMesh(nullptr);
mesh = subd->GetControlNetMesh(nullptr, ON_SubDGetControlNetMeshPriority::Geometry);
}
else if ( ON_Internal_UseSubDMeshProxy(*this) )
{