diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-01-17 03:51:42 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-01-17 03:51:42 +0300 |
| commit | 9bcdb4b758d96d1fe5345858f6c61a90f7c57eac (patch) | |
| tree | 51d1be5c5d7243b9782a10e8ed99a153f5392ef7 /intern/decimation | |
| parent | de9495e51915cae71ecdae05fdc21e5aef09ba4e (diff) | |
2.5: various warning fixes.
Diffstat (limited to 'intern/decimation')
| -rw-r--r-- | intern/decimation/intern/LOD_ExternNormalEditor.cpp | 4 | ||||
| -rw-r--r-- | intern/decimation/intern/LOD_ManMesh2.cpp | 2 | ||||
| -rw-r--r-- | intern/decimation/intern/LOD_QSDecimator.cpp | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/intern/decimation/intern/LOD_ExternNormalEditor.cpp b/intern/decimation/intern/LOD_ExternNormalEditor.cpp index b7c7b5a529b..21fd4f3e39f 100644 --- a/intern/decimation/intern/LOD_ExternNormalEditor.cpp +++ b/intern/decimation/intern/LOD_ExternNormalEditor.cpp @@ -41,8 +41,8 @@ LOD_ExternNormalEditor( LOD_Decimation_InfoPtr extern_info, LOD_ManMesh2 &mesh ) : - m_extern_info (extern_info), - m_mesh(mesh) + m_mesh(mesh), + m_extern_info (extern_info) { } diff --git a/intern/decimation/intern/LOD_ManMesh2.cpp b/intern/decimation/intern/LOD_ManMesh2.cpp index 2fe49b36583..99f1c7d926a 100644 --- a/intern/decimation/intern/LOD_ManMesh2.cpp +++ b/intern/decimation/intern/LOD_ManMesh2.cpp @@ -546,7 +546,7 @@ DeleteEdge( // edges[e] should already have been removed from the heap - MT_assert(edges[e].HeapPos() == 0xffffffff); + MT_assert(edges[e].HeapPos() == -1); edges[e] = edges[last]; // also have to swap there heap positions.!!!!! diff --git a/intern/decimation/intern/LOD_QSDecimator.cpp b/intern/decimation/intern/LOD_QSDecimator.cpp index 1a0ec87f05b..0b0de767a9a 100644 --- a/intern/decimation/intern/LOD_QSDecimator.cpp +++ b/intern/decimation/intern/LOD_QSDecimator.cpp @@ -91,10 +91,10 @@ LOD_QSDecimator( LOD_ExternNormalEditor &face_editor, LOD_ExternBufferEditor &extern_editor ) : + m_is_armed (false), m_mesh(mesh), m_face_editor(face_editor), - m_extern_editor(extern_editor), - m_is_armed (false) + m_extern_editor(extern_editor) { m_deg_edges.reserve(32); m_deg_faces.reserve(32); @@ -318,7 +318,7 @@ UpdateHeap( LOD_Edge &e = edge_set[*edge_it]; m_heap->Remove(&edge_set[0],e.HeapPos()); - e.HeapPos() = 0xffffffff; + e.HeapPos() = -1; } } |