archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Reverting change to decimation to fix compatibility with

Browse Source 
gcc 3.x (a better solution should be found)
This commit is contained in:
Chris Want
2002-12-28 17:45:46 +00:00
parent 707dfe1c38
commit 7c96971152
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
intern/decimation/intern/LOD_QSDecimator.cpp
View File

@@ -187,9 +187,9 @@ CollapseEdge(
} else { } else {
// the edge could not be collapsed at the moment - so // the edge could not be collapsed at the moment - so
// we adjust it's priority and add it back to the heap. // we adjust it's priority and add it back to the heap.
m_heap->Remove(edges.begin(),0); m_heap->Remove(&edges[0],0);
edges[heap_top].HeapKey() = - MT_INFINITY; edges[heap_top].HeapKey() = - MT_INFINITY;
m_heap->Insert(edges.begin(),heap_top); m_heap->Insert(&edges[0],heap_top);
} }
//clear all the temporary buffers //clear all the temporary buffers
@@ -278,7 +278,8 @@ BuildHeap(
heap_vector.push_back(i); heap_vector.push_back(i);
} }
m_heap->MakeHeap(edge_set.begin()); m_heap->MakeHeap(&edge_set[0]);
return true; return true;
} }
@@ -307,7 +308,7 @@ UpdateHeap(
// inser the new elements into the heap // inser the new elements into the heap
for (; edge_it != end_it; ++edge_it) { for (; edge_it != end_it; ++edge_it) {
m_heap->Insert(edge_set.begin(),*edge_it); m_heap->Insert(&edge_set[0],*edge_it);
} }
@@ -318,7 +319,7 @@ UpdateHeap(
for (; edge_it != end_it; ++edge_it) { for (; edge_it != end_it; ++edge_it) {
LOD_Edge &e = edge_set[*edge_it]; LOD_Edge &e = edge_set[*edge_it];
m_heap->Remove(edge_set.begin(),e.HeapPos()); m_heap->Remove(&edge_set[0],e.HeapPos());
e.HeapPos() = 0xffffffff; e.HeapPos() = 0xffffffff;