X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fanimation.cpp;h=2f78d1eafad574b4d1c060a8209d0527309cc393;hp=ccd37bca5e0daec3d782cfd8504827efca53b922;hb=89a1ada18430079896cfb28862e61bb32d66b8a0;hpb=a993091fbb8fdb76a1d02be9de59529c14b59cf0

diff --git a/source/animation.cpp b/source/animation.cpp
index ccd37bca..2f78d1ea 100644
--- a/source/animation.cpp
+++ b/source/animation.cpp
@@ -55,7 +55,7 @@ void Animation::add_keyframe(const Time::TimeDelta &t, const RefPtr<const KeyFra
 
 	bool realloc = (keyframes.size()>=keyframes.capacity());
 
-	keyframes.push_back(TimedKeyFrame(*this));
+	keyframes.push_back(TimedKeyFrame());
 	TimedKeyFrame &tkf = keyframes.back();
 	tkf.time = t;
 	tkf.keyframe = kf;
@@ -94,7 +94,7 @@ void Animation::prepare_keyframe(TimedKeyFrame &tkf)
 			uniforms.push_back(UniformInfo(i->first, i->second.size));
 	}
 
-	tkf.prepare();
+	tkf.prepare(*this);
 }
 
 
@@ -185,12 +185,11 @@ Matrix Animation::MatrixInterpolation::get(float t) const
 }
 
 
-Animation::TimedKeyFrame::TimedKeyFrame(const Animation &a):
-	animation(a),
+Animation::TimedKeyFrame::TimedKeyFrame():
 	prev(0)
 { }
 
-void Animation::TimedKeyFrame::prepare()
+void Animation::TimedKeyFrame::prepare(const Animation &animation)
 {
 	const KeyFrame::UniformMap &kf_uniforms = keyframe->get_uniforms();
 	for(KeyFrame::UniformMap::const_iterator i=kf_uniforms.begin(); i!=kf_uniforms.end(); ++i)