From b6f44859d7ab5b128d71ce0d64b46b171b9357aa Mon Sep 17 00:00:00 2001
From: clayjohn <claynjohn@gmail.com>
Date: Wed, 12 Oct 2022 12:45:47 -0700
Subject: Implement multiple clip_children modes for CanvasItems

---
 doc/classes/CanvasItem.xml      | 10 +++++++++-
 doc/classes/RenderingServer.xml |  6 ++++--
 2 files changed, 13 insertions(+), 3 deletions(-)

(limited to 'doc/classes')

diff --git a/doc/classes/CanvasItem.xml b/doc/classes/CanvasItem.xml
index 947e6a3d4c..b2d3e5cfdb 100644
--- a/doc/classes/CanvasItem.xml
+++ b/doc/classes/CanvasItem.xml
@@ -535,7 +535,7 @@
 		</method>
 	</methods>
 	<members>
-		<member name="clip_children" type="bool" setter="set_clip_children" getter="is_clipping_children" default="false">
+		<member name="clip_children" type="int" setter="set_clip_children_mode" getter="get_clip_children_mode" enum="CanvasItem.ClipChildrenMode" default="0">
 			Allows the current node to clip children nodes, essentially acting as a mask.
 		</member>
 		<member name="light_mask" type="int" setter="set_light_mask" getter="get_light_mask" default="1">
@@ -653,5 +653,13 @@
 		<constant name="TEXTURE_REPEAT_MAX" value="4" enum="TextureRepeat">
 			Represents the size of the [enum TextureRepeat] enum.
 		</constant>
+		<constant name="CLIP_CHILDREN_DISABLED" value="0" enum="ClipChildrenMode">
+		</constant>
+		<constant name="CLIP_CHILDREN_ONLY" value="1" enum="ClipChildrenMode">
+		</constant>
+		<constant name="CLIP_CHILDREN_AND_DRAW" value="2" enum="ClipChildrenMode">
+		</constant>
+		<constant name="CLIP_CHILDREN_MAX" value="3" enum="ClipChildrenMode">
+		</constant>
 	</constants>
 </class>
diff --git a/doc/classes/RenderingServer.xml b/doc/classes/RenderingServer.xml
index 6aa9237385..376ba34056 100644
--- a/doc/classes/RenderingServer.xml
+++ b/doc/classes/RenderingServer.xml
@@ -4576,9 +4576,11 @@
 		</constant>
 		<constant name="CANVAS_GROUP_MODE_DISABLED" value="0" enum="CanvasGroupMode">
 		</constant>
-		<constant name="CANVAS_GROUP_MODE_OPAQUE" value="1" enum="CanvasGroupMode">
+		<constant name="CANVAS_GROUP_MODE_CLIP_ONLY" value="1" enum="CanvasGroupMode">
 		</constant>
-		<constant name="CANVAS_GROUP_MODE_TRANSPARENT" value="2" enum="CanvasGroupMode">
+		<constant name="CANVAS_GROUP_MODE_CLIP_AND_DRAW" value="2" enum="CanvasGroupMode">
+		</constant>
+		<constant name="CANVAS_GROUP_MODE_TRANSPARENT" value="3" enum="CanvasGroupMode">
 		</constant>
 		<constant name="CANVAS_LIGHT_MODE_POINT" value="0" enum="CanvasLightMode">
 		</constant>
-- 
cgit v1.2.3