Skip to content

Commit

Permalink
Merge branch 'master'
Browse files Browse the repository at this point in the history
  • Loading branch information
alemuntoni committed May 17, 2022
2 parents ea60c48 + 4c992cd commit 8c65e1a
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 2 deletions.
14 changes: 14 additions & 0 deletions vcg/complex/base.h
Original file line number Diff line number Diff line change
Expand Up @@ -492,6 +492,20 @@ class TriMesh
attrn = 0;
imark = 0;
C()=Color4b::Gray;

typename std::set< PointerToAttribute>::iterator i;
for (i = vert_attr.begin(); i != vert_attr.end(); ++i)
((SimpleTempDataBase*)(*i)._handle)->Resize(0);

for (i = edge_attr.begin(); i != edge_attr.end(); ++i)
((SimpleTempDataBase*)(*i)._handle)->Resize(0);

for (i = face_attr.begin(); i != face_attr.end(); ++i)
((SimpleTempDataBase*)(*i)._handle)->Resize(0);

for (i = tetra_attr.begin(); i != tetra_attr.end(); ++i)
((SimpleTempDataBase*)(*i)._handle)->Resize(0);

}


Expand Down
7 changes: 5 additions & 2 deletions vcg/container/simple_temporary_data.h
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,11 @@ class VectorNBW<bool, p...>
void resize(size_t sz)
{
int oldDatasize = datasize;
if ((int) sz <= oldDatasize)
return;
if ((int)sz <= oldDatasize)
{
datasize = sz;
return;
}
if (sz > datareserve)
reserve(sz);
datasize = sz;
Expand Down

0 comments on commit 8c65e1a

Please sign in to comment.