[mutter] clutter/actor: Don't union child paint volumes if clip is set

[Marge Bot <marge-bot src gnome org>]

commit 44563d29326aacb53936b2bf082e31aca72e7b04
Author: Jonas Dreßler <verdre v0yd nl>
Date:   Sat Nov 21 11:17:55 2020 +0100

    clutter/actor: Don't union child paint volumes if clip is set
    
    When a custom clip is set for an actor, this actor is not going to allow
    any painting outside that clip. That includes the children, which may
    also not paint outside that clip.
    
    Now in case clip_to_allocation is set to TRUE, we already already do the
    right thing and simply use the allocation as our paint volume, ignoring
    the volumes of our children. The same should be done for the custom
    clip, so also stop the process of building the paint volume once we see
    that a custom clip is set and simply use that clip.
    
    Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1592>

 clutter/clutter/clutter-actor.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/clutter/clutter/clutter-actor.c b/clutter/clutter/clutter-actor.c
index 66a0968514..9ba0050a87 100644
--- a/clutter/clutter/clutter-actor.c
+++ b/clutter/clutter/clutter-actor.c
@@ -5736,7 +5736,7 @@ clutter_actor_update_default_paint_volume (ClutterActor       *self,
           clutter_paint_volume_set_width (volume, priv->clip.size.width);
           clutter_paint_volume_set_height (volume, priv->clip.size.height);
 
-          res = TRUE;
+          return TRUE;
         }
 
       /* if we don't have children we just bail out here... */