X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fanimation.cpp;h=ab9d6e6085c35a36d1f430b652586411e7849047;hp=1cfb533f94eb3cd901ecba9dc501d28433224a15;hb=a4549c55a6d47129bd9e42c6a49a671b759ce6d9;hpb=ae161d1081b42be523aecb72dfe209d6aee6f770

diff --git a/source/animation.cpp b/source/animation.cpp
index 1cfb533f..ab9d6e60 100644
--- a/source/animation.cpp
+++ b/source/animation.cpp
@@ -1,7 +1,6 @@
 #include <cmath>
 #include <msp/core/maputils.h>
 #include <msp/datafile/collection.h>
-#include <msp/time/units.h>
 #include "animation.h"
 #include "animationeventobserver.h"
 #include "armature.h"
@@ -78,9 +77,10 @@ void Animation::add_keyframe(const Time::TimeDelta &t, const RefPtr<const KeyFra
 	if(realloc)
 	{
 		for(unsigned i=1; i<keyframes.size(); ++i)
-			keyframes[i].prev = &keyframes[i-1];
+			if(keyframes[i].prev)
+				keyframes[i].prev = &keyframes[i-1];
 	}
-	else if(keyframes.size()>1)
+	if(keyframes.size()>1 && t>(&tkf-1)->time)
 		tkf.prev = &tkf-1;
 
 	prepare_keyframe(tkf);