Browse Source

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

Rename Viewport::ClearMode::CLEAR_MODE_ONLY_NEXT_FRAME to CLEAR_MODE_ONCE
Rémi Verschelde 4 years ago
parent
commit
d62dcb6b01
3 changed files with 5 additions and 5 deletions
  1. 3 3
      doc/classes/SubViewport.xml
  2. 1 1
      scene/main/viewport.cpp
  3. 1 1
      scene/main/viewport.h

+ 3 - 3
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.

+ 1 - 1
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);

+ 1 - 1
scene/main/viewport.h

@@ -624,7 +624,7 @@ public:
 	enum ClearMode {
 		CLEAR_MODE_ALWAYS,
 		CLEAR_MODE_NEVER,
-		CLEAR_MODE_ONLY_NEXT_FRAME
+		CLEAR_MODE_ONCE
 	};
 
 	enum UpdateMode {