summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2020-03-18 08:15:12 +0100
committerGitHub <noreply@github.com>2020-03-18 08:15:12 +0100
commit6b6174e210194132c05b36fd8ddc28b3ba09c289 (patch)
tree42083fd2502bf862a4bf6b9772be9a7f51727841
parentc886d3877880bb995ad1db2a10e3086b62616691 (diff)
parent760095e28d7ff1f6cce2f0c2458978f725264320 (diff)
Merge pull request #37122 from rmvermeulen/proposal-590/viewport-size-warning
Add size warning to Viewport Node
-rw-r--r--scene/main/viewport.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/scene/main/viewport.cpp b/scene/main/viewport.cpp
index dfd55e2577..8ef3bdd04e 100644
--- a/scene/main/viewport.cpp
+++ b/scene/main/viewport.cpp
@@ -2948,12 +2948,14 @@ Control *Viewport::get_modal_stack_top() const {
}
String Viewport::get_configuration_warning() const {
-
/*if (get_parent() && !Object::cast_to<Control>(get_parent()) && !render_target) {
return TTR("This viewport is not set as render target. If you intend for it to display its contents directly to the screen, make it a child of a Control so it can obtain a size. Otherwise, make it a RenderTarget and assign its internal texture to some node for display.");
}*/
+ if (size.x == 0 || size.y == 0) {
+ return TTR("Viewport size must be greater than 0 to render anything.");
+ }
return String();
}