From 44857d666401f5567d5e4791c685cb7c3c50e949 Mon Sep 17 00:00:00 2001
From: Mikko Rasa <tdb@tdb.fi>
Date: Sat, 1 Aug 2015 22:53:35 +0300
Subject: [PATCH] Also set uniforms in tick_stacked

---
 source/animationplayer.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/source/animationplayer.cpp b/source/animationplayer.cpp
index 9db88e78..ffb902a8 100644
--- a/source/animationplayer.cpp
+++ b/source/animationplayer.cpp
@@ -93,6 +93,10 @@ bool AnimationPlayer::tick_stacked(ObjectSlot &slot, const Time::TimeDelta &dt)
 	{
 		i->iterator += dt;
 		matrix *= i->iterator.get_matrix();
+
+		unsigned n_uniforms = i->animation.get_n_uniforms();
+		for(unsigned j=0; j<n_uniforms; ++j)
+			slot.object.set_uniform(i->animation.get_uniform_name(j), i->iterator.get_uniform(j));
 	}
 	slot.object.set_matrix(matrix);
 
-- 
2.45.2