Merge pull request #44267 from madmiraal/rename-viewport-enums

Rename Viewport::ClearMode::CLEAR_MODE_ONLY_NEXT_FRAME to CLEAR_MODE_ONCE
godotengine · Dec 10, 2020 · d62dcb6 · d62dcb6
2 parents 2ac8c3b + 284642b
commit d62dcb6
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/doc/classes/SubViewport.xml b/doc/classes/SubViewport.xml
@@ -45,8 +45,8 @@
 		<constant name="CLEAR_MODE_NEVER" value="1" enum="ClearMode">
 			Never clear the render target.
 		</constant>
-		<constant name="CLEAR_MODE_ONLY_NEXT_FRAME" value="2" enum="ClearMode">
-			Clear the render target next frame, then switch to [constant CLEAR_MODE_NEVER].
+		<constant name="CLEAR_MODE_ONCE" value="2" enum="ClearMode">
+			Clear the render target on the next frame, then switch to [constant CLEAR_MODE_NEVER].
 		</constant>
 		<constant name="UPDATE_DISABLED" value="0" enum="UpdateMode">
 			Do not update the render target.
@@ -58,7 +58,7 @@
 			Update the render target only when it is visible. This is the default value.
 		</constant>
 		<constant name="UPDATE_WHEN_PARENT_VISIBLE" value="3" enum="UpdateMode">
-			Update the render target only when the its parent is visible.
+			Update the render target only when its parent is visible.
 		</constant>
 		<constant name="UPDATE_ALWAYS" value="4" enum="UpdateMode">
 			Always update the render target.

diff --git a/scene/main/viewport.cpp b/scene/main/viewport.cpp
@@ -3824,7 +3824,7 @@ void SubViewport::_bind_methods() {
 
 	BIND_ENUM_CONSTANT(CLEAR_MODE_ALWAYS);
 	BIND_ENUM_CONSTANT(CLEAR_MODE_NEVER);
-	BIND_ENUM_CONSTANT(CLEAR_MODE_ONLY_NEXT_FRAME);
+	BIND_ENUM_CONSTANT(CLEAR_MODE_ONCE);
 
 	BIND_ENUM_CONSTANT(UPDATE_DISABLED);
 	BIND_ENUM_CONSTANT(UPDATE_ONCE);

diff --git a/scene/main/viewport.h b/scene/main/viewport.h
@@ -624,7 +624,7 @@ class SubViewport : public Viewport {
 	enum ClearMode {
 		CLEAR_MODE_ALWAYS,
 		CLEAR_MODE_NEVER,
-		CLEAR_MODE_ONLY_NEXT_FRAME
+		CLEAR_MODE_ONCE
 	};
 
 	enum UpdateMode {