summaryrefslogtreecommitdiff
path: root/clutter/clutter-state.c
diff options
context:
space:
mode:
authorBastian Winkler <buz@netbuz.org>2010-09-17 13:21:03 +0200
committerEmmanuele Bassi <ebassi@linux.intel.com>2010-09-20 14:25:21 +0100
commit695839c6f3527e3838bf104d26d3ff32b85aff3f (patch)
tree3424b3f25b0951c920cfa84339f21a494616525b /clutter/clutter-state.c
parent172fc6bfedeefcb337ccefbf38b427c5be2591cd (diff)
downloadclutter-695839c6f3527e3838bf104d26d3ff32b85aff3f.tar.gz
state: Request the animator for the default state
Try to use the default-state animator in case there is no animator for this specific state change request. http://bugzilla.clutter-project.org/show_bug.cgi?id=2325
Diffstat (limited to 'clutter/clutter-state.c')
-rw-r--r--clutter/clutter-state.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/clutter/clutter-state.c b/clutter/clutter-state.c
index 2c07b1aea..f2e7c1810 100644
--- a/clutter/clutter-state.c
+++ b/clutter/clutter-state.c
@@ -510,6 +510,10 @@ clutter_state_change (ClutterState *state,
priv->target_state_name);
priv->target_state = new_state;
+ if (animator == NULL && new_state->keys == NULL)
+ animator = clutter_state_get_animator (state, NULL,
+ priv->target_state_name);
+
if (animator != NULL)
{
/* we've got an animator overriding the tweened animation */