From 42f6364cac945e451725fc4aeeccf28ee5019ff3 Mon Sep 17 00:00:00 2001 From: Robert Bragg Date: Fri, 24 Sep 2010 02:24:36 +0100 Subject: [PATCH] actor: don't dirty pick buffer in _real_queue_redraw Since re-working how redraws are queued it is no longer necessary to dirty the pick buffer in _clutter_actor_real_queue_redraw since this should now reliably be handled in _clutter_stage_queue_actor_redraw. --- clutter/clutter-actor.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/clutter/clutter-actor.c b/clutter/clutter-actor.c index 352e02f07..946d9cdae 100644 --- a/clutter/clutter-actor.c +++ b/clutter/clutter-actor.c @@ -1798,7 +1798,6 @@ clutter_actor_real_queue_redraw (ClutterActor *self, ClutterActor *origin) { ClutterActor *parent; - ClutterActor *stage; CLUTTER_NOTE (PAINT, "Redraw queued on '%s' (from: '%s')", get_actor_debug_name (self), @@ -1816,13 +1815,6 @@ clutter_actor_real_queue_redraw (ClutterActor *self, if (!CLUTTER_ACTOR_IS_VISIBLE (self)) return; - /* XXX: when we merge the paint-box branch we should only need to - * invalidate the pick buffer in _clutter_stage_queue_actor_redraw - */ - stage = _clutter_actor_get_stage_internal (self); - if (stage != NULL) - _clutter_stage_set_pick_buffer_valid (CLUTTER_STAGE (stage), FALSE); - /* Although we could determine here that a full stage redraw * has already been queued and immediately bail out, we actually * guarantee that we will propagate a queue-redraw signal to our @@ -1832,6 +1824,7 @@ clutter_actor_real_queue_redraw (ClutterActor *self, */ if (self->priv->propagated_one_redraw) { + ClutterActor *stage = _clutter_actor_get_stage_internal (self); if (stage != NULL && _clutter_stage_has_full_redraw_queued (CLUTTER_STAGE (stage))) return;