Reverting change to decimation to fix compatibility with

gcc 3.x (a better solution should be found)

1 files changed, 6 insertions, 5 deletions

diff --git a/intern/decimation/intern/LOD_QSDecimator.cpp b/intern/decimation/intern/LOD_QSDecimator.cpp
index c1299a2dd37..231f076a78c 100644
--- a/intern/decimation/intern/LOD_QSDecimator.cpp
+++ b/intern/decimation/intern/LOD_QSDecimator.cpp
@@ -187,9 +187,9 @@ CollapseEdge(
 	} else {
 		// the edge could not be collapsed at the moment - so
 		// 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;
-		m_heap->Insert(edges.begin(),heap_top);
+		m_heap->Insert(&edges[0],heap_top);
 	}
 
 	//clear all the temporary buffers
@@ -278,7 +278,8 @@ BuildHeap(
 		heap_vector.push_back(i);
 	}
 	
-	m_heap->MakeHeap(edge_set.begin());
+	m_heap->MakeHeap(&edge_set[0]);
+
 	return true;
 }
 
@@ -307,7 +308,7 @@ UpdateHeap(
 	// inser the new elements into the heap
 
 	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) {
 		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;