Pixyco-XYZ/openmesh
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Fixed segfault of copy_all_properties if one property has been removed before. (Thanks to Simon Flöry for the patch)

Browse Source 
- Added unittest for this case



git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@951 fdac6126-5c0c-442c-9429-916003d36597
This commit is contained in:
Jan Möbius
2013-08-29 07:17:03 +00:00
parent c531ddf504
commit ee37edb46b
2 changed files with 182 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/OpenMesh/Core/Mesh/BaseKernel.hh
View File

@@ -472,7 +472,7 @@ public:
// Copy all properties, if build in is true
// Otherwise, copy only properties without build in specifier
if ( _copyBuildIn || (*p_it)->name().substr(0,2) != "v:")
if ( *p_it && ( _copyBuildIn || (*p_it)->name().substr(0,2) != "v:" ) )
(*p_it)->copy(_vh_from.idx(), _vh_to.idx());
}
@@ -491,7 +491,7 @@ public:
// Copy all properties, if build in is true
// Otherwise, copy only properties without build in specifier
if ( _copyBuildIn || (*p_it)->name().substr(0,2) != "h:")
if ( *p_it && ( _copyBuildIn || (*p_it)->name().substr(0,2) != "h:") )
(*p_it)->copy(_hh_from.idx(), _hh_to.idx());
}
@@ -509,7 +509,7 @@ public:
// Copy all properties, if build in is true
// Otherwise, copy only properties without build in specifier
if ( _copyBuildIn || (*p_it)->name().substr(0,2) != "e:")
if ( *p_it && ( _copyBuildIn || (*p_it)->name().substr(0,2) != "e:") )
(*p_it)->copy(_eh_from.idx(), _eh_to.idx());
}
@@ -529,7 +529,7 @@ public:
// Copy all properties, if build in is true
// Otherwise, copy only properties without build in specifier
if ( _copyBuildIn || (*p_it)->name().substr(0,2) != "f:")
if ( *p_it && ( _copyBuildIn || (*p_it)->name().substr(0,2) != "f:") )
(*p_it)->copy(_fh_from.idx(), _fh_to.idx());
}