maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #17555 from poke1024/add-worldenv-warning

Browse source 
Warn about WorldEnvironment being ignored
This commit is contained in:
Rémi Verschelde 2018-03-23 11:27:03 +01:00 committed by GitHub
parent e2e29d3e82 29d305599d
commit f720d86b0b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
scene/3d/scenario_fx.cpp
View file

@ -79,7 +79,11 @@ Ref<Environment> WorldEnvironment::get_environment() const {
String WorldEnvironment::get_configuration_warning() const {
if (/*!is_visible_in_tree() ||*/ !is_inside_tree() || !environment.is_valid())
if (!environment.is_valid()) {
return TTR("WorldEnvironment needs an Environment resource.");
}
if (/*!is_visible_in_tree() ||*/ !is_inside_tree())
return String();
List<Node *> nodes;
@ -89,6 +93,10 @@ String WorldEnvironment::get_configuration_warning() const {
return TTR("Only one WorldEnvironment is allowed per scene (or set of instanced scenes).");
}
if (environment.is_valid() && get_viewport() && !get_viewport()->get_camera() && environment->get_background() != Environment::BG_CANVAS) {
return TTR("This WorldEnvironment is ignored. Either add a Camera (for 3D scenes) or set this environment's Background Mode to Canvas (for 2D scenes).");
}
return String();
}