From b961d5484c268999972db48d56c4ee274b49e359 Mon Sep 17 00:00:00 2001 From: Chris Lord Date: Wed, 19 Mar 2008 11:38:53 +0000 Subject: [PATCH] * clutter/clutter-actor.c: (_clutter_actor_apply_modelview_transform), (clutter_actor_paint): Apply clip inside paint function instead of transform function --- ChangeLog | 6 ++++++ clutter/clutter-actor.c | 12 ++++++------ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2c8d625f2..9f0af077b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-03-19 Chris Lord + + * clutter/clutter-actor.c: + (_clutter_actor_apply_modelview_transform), (clutter_actor_paint): + Apply clip inside paint function instead of transform function + 2008-03-18 Emmanuele Bassi * clutter/clutter-score.c: Update documentation. diff --git a/clutter/clutter-actor.c b/clutter/clutter-actor.c index 5043ebe5d..c4d501705 100644 --- a/clutter/clutter-actor.c +++ b/clutter/clutter-actor.c @@ -1133,12 +1133,6 @@ _clutter_actor_apply_modelview_transform (ClutterActor * self) if (priv->z) cogl_translatex (0, 0, priv->z); - - if (priv->has_clip) - cogl_clip_set (CLUTTER_UNITS_TO_FIXED (priv->clip[0]), - CLUTTER_UNITS_TO_FIXED (priv->clip[1]), - CLUTTER_UNITS_TO_FIXED (priv->clip[2]), - CLUTTER_UNITS_TO_FIXED (priv->clip[3])); } /* Recursively applies the transforms associated with this actor and @@ -1209,6 +1203,12 @@ clutter_actor_paint (ClutterActor *self) _clutter_actor_apply_modelview_transform (self); + if (priv->has_clip) + cogl_clip_set (CLUTTER_UNITS_TO_FIXED (priv->clip[0]), + CLUTTER_UNITS_TO_FIXED (priv->clip[1]), + CLUTTER_UNITS_TO_FIXED (priv->clip[2]), + CLUTTER_UNITS_TO_FIXED (priv->clip[3])); + if (G_UNLIKELY(context->pick_mode != CLUTTER_PICK_NONE)) { gint r, g, b;