summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <remi@verschelde.fr>2021-07-12 14:52:28 +0200
committerGitHub <noreply@github.com>2021-07-12 14:52:28 +0200
commit5226fa11b5b8b8d2f46f00b27262365038d5b43e (patch)
treea53346128e50589d210b6585470cda77fa5ff0eb
parent8dccf0f9b5a89c08cdff8154c34f0d975cc0f740 (diff)
parente3be0913d73bdc1ff45acef30209df519c0eff2a (diff)
Merge pull request #50392 from TaskManagerCZ/master
Explicit error message when setting active a Viewport that is already active
-rw-r--r--servers/rendering/renderer_viewport.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/servers/rendering/renderer_viewport.cpp b/servers/rendering/renderer_viewport.cpp
index f651fbfa75..15ce1dbe63 100644
--- a/servers/rendering/renderer_viewport.cpp
+++ b/servers/rendering/renderer_viewport.cpp
@@ -694,7 +694,7 @@ void RendererViewport::viewport_set_active(RID p_viewport, bool p_active) {
ERR_FAIL_COND(!viewport);
if (p_active) {
- ERR_FAIL_COND(active_viewports.find(viewport) != -1); //already active
+ ERR_FAIL_COND_MSG(active_viewports.find(viewport) != -1, "Can't make active a Viewport that is already active.");
viewport->occlusion_buffer_dirty = true;
active_viewports.push_back(viewport);
} else {