Commit 06c13f78 authored by hybrid's avatar hybrid

Merge from 1.7 branch, revisions 3389-3419. Only a valgrind warning in...

Merge from 1.7 branch, revisions 3389-3419. Only a valgrind warning in heapsort. Also skipped the date bump, which would cause too many conflicts. Will be changed later on manually.

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@3420 dfc29bdd-3216-0410-991c-e03cc46cb475
parent 43a1fd36
......@@ -53,9 +53,8 @@ inline void heapsort(T* array_, s32 size)
for (i=((size-1)/2); i>=0; --i)
heapsink(virtualArray, i+1, virtualSize-1);
// sort array
for (i=size-1; i>=0; --i)
// sort array, leave out the last element (0)
for (i=size-1; i>0; --i)
{
T t = array_[0];
array_[0] = array_[i];
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment