X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fanimatedobject.h;h=2b640b763fa1859807f5a2a0736b44c57ca7aa87;hp=23333ee53dfb4e5e347c97ed97d7c05b033e737a;hb=ff85f90d33023d908c534b0bf5d9a65e9fc2cce2;hpb=00d926c3fe134820139a925cfac28cd64729db93

diff --git a/source/animatedobject.h b/source/animatedobject.h
index 23333ee5..2b640b76 100644
--- a/source/animatedobject.h
+++ b/source/animatedobject.h
@@ -16,7 +16,7 @@ An object instance that can be animated by an AnimationPlayer.
 class AnimatedObject: public ObjectInstance
 {
 public:
-	class Loader: public DataFile::ObjectLoader<AnimatedObject>
+	class Loader: public DataFile::DerivedObjectLoader<AnimatedObject, ObjectInstance::Loader>
 	{
 	public:
 		Loader(AnimatedObject &);
@@ -37,6 +37,10 @@ public:
 	~AnimatedObject();
 
 	void set_pose_matrix(unsigned, const Matrix &);
+	ProgramData &get_shader_data();
+	const ProgramData &get_shader_data() const;
+
+	// Deprecated
 	void set_uniform(const std::string &, const KeyFrame::AnimatedUniform &);
 
 	virtual const Matrix *get_matrix() const { return &matrix; }