godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Rename Viewport::ClearMode::CLEAR_MODE_ONLY_NEXT_FRAME to CLEAR_MODE_ONCE
This commit is contained in:
Rémi Verschelde 2020-12-10 14:28:37 +01:00 committed by GitHub
parent 2ac8c3b6dc 284642be01
commit d62dcb6b01
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
doc/classes/SubViewport.xml
View File

@ -45,8 +45,8 @@
<constant name="CLEAR_MODE_NEVER" value="1" enum="ClearMode"> <constant name="CLEAR_MODE_NEVER" value="1" enum="ClearMode">
Never clear the render target. Never clear the render target.
</constant> </constant>
<constant name="CLEAR_MODE_ONLY_NEXT_FRAME" value="2" enum="ClearMode"> <constant name="CLEAR_MODE_ONCE" value="2" enum="ClearMode">
Clear the render target next frame, then switch to [constant CLEAR_MODE_NEVER]. Clear the render target on the next frame, then switch to [constant CLEAR_MODE_NEVER].
</constant> </constant>
<constant name="UPDATE_DISABLED" value="0" enum="UpdateMode"> <constant name="UPDATE_DISABLED" value="0" enum="UpdateMode">
Do not update the render target. Do not update the render target.
@ -58,7 +58,7 @@
Update the render target only when it is visible. This is the default value. Update the render target only when it is visible. This is the default value.
</constant> </constant>
<constant name="UPDATE_WHEN_PARENT_VISIBLE" value="3" enum="UpdateMode"> <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>
<constant name="UPDATE_ALWAYS" value="4" enum="UpdateMode"> <constant name="UPDATE_ALWAYS" value="4" enum="UpdateMode">
Always update the render target. Always update the render target.

2
scene/main/viewport.cpp
View File

@ -3824,7 +3824,7 @@ void SubViewport::_bind_methods() {
BIND_ENUM_CONSTANT(CLEAR_MODE_ALWAYS); BIND_ENUM_CONSTANT(CLEAR_MODE_ALWAYS);
BIND_ENUM_CONSTANT(CLEAR_MODE_NEVER); 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_DISABLED);
BIND_ENUM_CONSTANT(UPDATE_ONCE); BIND_ENUM_CONSTANT(UPDATE_ONCE);

2
scene/main/viewport.h
View File

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