diff options
| author | Erwin Coumans <blender@erwincoumans.com> | 2006-06-02 22:17:40 +0400 |
|---|---|---|
| committer | Erwin Coumans <blender@erwincoumans.com> | 2006-06-02 22:17:40 +0400 |
| commit | abd8fba47ff297574e9418bb1d951cc483751fba (patch) | |
| tree | 4ee61489016983ea3b2c0a695b372474fc2ba0f6 /intern/bsp | |
| parent | d40c1fc2030142b07990f01bbcf2c0dfa770075f (diff) | |
applied patch [ #4207 ] Boolean operations fix
Also fixed other problems with STL iterators/vectors, that only show up under Visual Studio 2005.
See also http://projects.blender.org/pipermail/bf-committers/2006-May/014608.html
Diffstat (limited to 'intern/bsp')
| -rwxr-xr-x | intern/bsp/intern/BSP_CSGMesh_CFIterator.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/intern/bsp/intern/BSP_CSGMesh_CFIterator.h b/intern/bsp/intern/BSP_CSGMesh_CFIterator.h index 77ba076885f..9cd237873c7 100755 --- a/intern/bsp/intern/BSP_CSGMesh_CFIterator.h +++ b/intern/bsp/intern/BSP_CSGMesh_CFIterator.h @@ -69,7 +69,8 @@ BSP_CSGMesh_VertexIt_Done( // assume CSG_IteratorPtr is of the correct type. BSP_CSGMesh_VertexIt * vertex_it = (BSP_CSGMesh_VertexIt *)it; - if (vertex_it->pos < &(*vertex_it->mesh->VertexSet().end())) return 0; + /* dereferencing iterator::end() is illegal, so we dereference 1 before it */ + if (vertex_it->pos <= &(*(vertex_it->mesh->VertexSet().end() -1) )) return 0; return 1; }; @@ -161,7 +162,8 @@ BSP_CSGMesh_FaceIt_Done( // assume CSG_IteratorPtr is of the correct type. BSP_CSGMesh_FaceIt * face_it = (BSP_CSGMesh_FaceIt *)it; - if (face_it->pos < &(*face_it->mesh->FaceSet().end())) { + /* dereferencing iterator::end() is illegal, so we dereference 1 before it */ + if (face_it->pos <= &(*(face_it->mesh->FaceSet().end() -1))) { if (face_it->face_triangle + 3 <= face_it->pos->m_verts.size()) { return 0; } @@ -253,8 +255,8 @@ BSP_CSGMesh_FaceIt_Step( // assume CSG_IteratorPtr is of the correct type. BSP_CSGMesh_FaceIt * face_it = (BSP_CSGMesh_FaceIt *)it; - // safety guard - if (face_it->pos < &(*face_it->mesh->FaceSet().end())) { + /* dereferencing iterator::end() is illegal, so we dereference 1 before it */ + if (face_it->pos <= &(*(face_it->mesh->FaceSet().end() -1))) { //if (face_it->face_triangle + 3 < face_it->pos->m_verts.size()) { // (face_it->face_triangle)++; |