From 91a9a355c32e86e597c57f3fd8b4deaecad0b9a4 Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Tue, 12 Oct 2010 14:04:21 +0100 Subject: [PATCH] actor: Check CluterActorMeta:enabled Instead of delegating the check for the ActorMeta:enabled property to the sub-classes of ClutterActorMeta, ClutterActor can do the check prior to using the ClutterActorMeta instances. --- clutter/clutter-actor.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/clutter/clutter-actor.c b/clutter/clutter-actor.c index ba25a95a6..a2064589c 100644 --- a/clutter/clutter-actor.c +++ b/clutter/clutter-actor.c @@ -2280,6 +2280,10 @@ _clutter_actor_effects_pre_paint (ClutterActor *self) for (l = effects; l != NULL; l = l->next) { ClutterEffect *effect = l->data; + ClutterActorMeta *meta = l->data; + + if (!clutter_actor_meta_get_enabled (meta)) + continue; priv->current_effect = l->data; @@ -2304,6 +2308,10 @@ _clutter_actor_effects_post_paint (ClutterActor *self) for (l = g_list_last ((GList *) effects); l != NULL; l = l->prev) { ClutterEffect *effect = l->data; + ClutterActorMeta *meta = l->data; + + if (!clutter_actor_meta_get_enabled (meta)) + continue; priv->current_effect = l->data; @@ -5687,7 +5695,10 @@ clutter_actor_allocate (ClutterActor *self, for (l = constraints; l != NULL; l = l->next) { ClutterConstraint *constraint = l->data; - _clutter_constraint_update_allocation (constraint, self, &alloc); + ClutterActorMeta *meta = l->data; + + if (clutter_actor_meta_get_enabled (meta)) + _clutter_constraint_update_allocation (constraint, self, &alloc); } }