[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [29323] trunk/blender/source/blender/ collada/DocumentExporter.cpp: Merge -c 29322 from COLLADA branch into trunk .

[Arystanbek Dyussenov]

Revision: 29323
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=29323
Author:   kazanbas
Date:     2010-06-07 22:37:56 +0200 (Mon, 07 Jun 2010)

Log Message:
-----------
Merge -c 29322 from COLLADA branch into trunk.

Modified Paths:
--------------
    trunk/blender/source/blender/collada/DocumentExporter.cpp

Modified: trunk/blender/source/blender/collada/DocumentExporter.cpp
===================================================================
--- trunk/blender/source/blender/collada/DocumentExporter.cpp	2010-06-07 20:19:09 UTC (rev 29322)
+++ trunk/blender/source/blender/collada/DocumentExporter.cpp	2010-06-07 20:37:56 UTC (rev 29323)
@@ -2482,6 +2482,9 @@
 				}
 			}
 		}
+
+		// keep the keys in ascending order
+		std::sort(fra.begin(), fra.end());
 	}
 
 	void find_rotation_frames(Object *ob, std::vector<float> &fra, const char *prefix, int rotmode)