From 284642be01c026501f1bc635f336fdf6efe61b78 Mon Sep 17 00:00:00 2001 From: Marcel Admiraal Date: Thu, 10 Dec 2020 12:19:04 +0000 Subject: [PATCH] Rename Viewport::ClearMode::CLEAR_MODE_ONLY_NEXT_FRAME to CLEAR_MODE_ONCE --- doc/classes/SubViewport.xml | 6 +++--- scene/main/viewport.cpp | 2 +- scene/main/viewport.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/doc/classes/SubViewport.xml b/doc/classes/SubViewport.xml index 47364013956..376082f417d 100644 --- a/doc/classes/SubViewport.xml +++ b/doc/classes/SubViewport.xml @@ -45,8 +45,8 @@ Never clear the render target. - - 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]. 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 the its parent is visible. + Update the render target only when its parent is visible. Always update the render target. diff --git a/scene/main/viewport.cpp b/scene/main/viewport.cpp index 6350777a3d9..e496748b2d6 100644 --- 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 index 7ce202d27c4..f08f255dde5 100644 --- a/scene/main/viewport.h +++ b/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 {