diff --git a/clutter/clutter-private.h b/clutter/clutter-private.h index a50b9f0db..f5d958780 100644 --- a/clutter/clutter-private.h +++ b/clutter/clutter-private.h @@ -53,7 +53,7 @@ G_BEGIN_DECLS typedef enum { - CLUTTER_ACTOR_UNUSED_FLAG = 0, + CLUTTER_ACTOR_UNUSED_FLAG = 0, CLUTTER_ACTOR_IN_DESTRUCTION = 1 << 0, CLUTTER_ACTOR_IS_TOPLEVEL = 1 << 1, @@ -62,10 +62,9 @@ typedef enum { * viewport / perspective etc * needs (re)setting. */ - CLUTTER_ACTOR_IN_PAINT = 1 << 4, /* Used to avoid recursion */ - CLUTTER_ACTOR_IN_RELAYOUT = 1 << 5, /* Used to avoid recursion */ - CLUTTER_TEXTURE_IN_CLONE_PAINT = 1 << 6, /* Used for safety in clones */ - CLUTTER_STAGE_IN_RESIZE = 1 << 7 + CLUTTER_ACTOR_IN_PAINT = 1 << 4, /* Used to avoid recursion */ + CLUTTER_ACTOR_IN_RELAYOUT = 1 << 5, /* Used to avoid recursion */ + CLUTTER_STAGE_IN_RESIZE = 1 << 6 } ClutterPrivateFlags; struct _ClutterInputDevice diff --git a/clutter/clutter-texture.c b/clutter/clutter-texture.c index 619c2387d..ecab42b82 100644 --- a/clutter/clutter-texture.c +++ b/clutter/clutter-texture.c @@ -610,13 +610,6 @@ clutter_texture_paint (ClutterActor *self) clutter_shader_set_is_enabled (shader, TRUE); } - /* A clone may need to fire above if were a TFP/FBO but not visible. - * Ultimatly needs some reworking with maybe an extra prepare_paint - * method or some such. - */ - if (CLUTTER_PRIVATE_FLAGS(self) & CLUTTER_TEXTURE_IN_CLONE_PAINT) - return; - CLUTTER_NOTE (PAINT, "painting texture '%s'", clutter_actor_get_name (self) ? clutter_actor_get_name (self)