kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Sorry, Kent the indexing changes to this file turn out to be broken

Browse Source 
too -- a user reported crashing while using decimation and rolling back
the modifications between rev 1.2 and rev 1.3 for this file fixed it.

Regards,
Chris
This commit is contained in:
Chris Want 2002-12-25 21:42:56 +00:00
parent f8b3f65d85
commit 331fffaecb
1 changed files with 5 additions and 6 deletions
Show Stats 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[0],0); m_heap->Remove(edges.begin(),0);
edges[heap_top].HeapKey() = - MT_INFINITY; edges[heap_top].HeapKey() = - MT_INFINITY;
m_heap->Insert(&edges[0],heap_top); m_heap->Insert(edges.begin(),heap_top);
} }
//clear all the temporary buffers //clear all the temporary buffers
@ -278,8 +278,7 @@ BuildHeap(
heap_vector.push_back(i); heap_vector.push_back(i);
} }
m_heap->MakeHeap(&edge_set[0]); m_heap->MakeHeap(edge_set.begin());
return true; return true;
} }
@ -308,7 +307,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[0],*edge_it); m_heap->Insert(edge_set.begin(),*edge_it);
} }
@ -319,7 +318,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[0],e.HeapPos()); m_heap->Remove(edge_set.begin(),e.HeapPos());
e.HeapPos() = 0xffffffff; e.HeapPos() = 0xffffffff;