Bläddra i källkod

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

Warn about WorldEnvironment being ignored
Rémi Verschelde 7 år sedan
förälder
incheckning
f720d86b0b
1 ändrade filer med 9 tillägg och 1 borttagningar
  1. 9 1
      scene/3d/scenario_fx.cpp

+ 9 - 1
scene/3d/scenario_fx.cpp

@@ -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();
 }