Merge pull request #36175 from akien-mga/remove-more-deprecated-stuff

Remove deprecated methods and code

1 files changed, 1 insertions, 6 deletions

diff --git a/scene/3d/world_environment.cpp b/scene/3d/world_environment.cpp
index a4c990c81d..83a7243906 100644
--- a/scene/3d/world_environment.cpp
+++ b/scene/3d/world_environment.cpp
@@ -121,7 +121,7 @@ String WorldEnvironment::get_configuration_warning() const {
 		return TTR("WorldEnvironment requires its \"Environment\" property to contain an Environment to have a visible effect.");
 	}
 
-	if (/*!is_visible_in_tree() ||*/ !is_inside_tree())
+	if (!is_inside_tree())
 		return String();
 
 	List<Node *> nodes;
@@ -131,11 +131,6 @@ String WorldEnvironment::get_configuration_warning() const {
 		return TTR("Only one WorldEnvironment is allowed per scene (or set of instanced scenes).");
 	}
 
-	// Commenting this warning for now, I think it makes no sense. If anyone can figure out what its supposed to do, feedback welcome. Else it should be deprecated.
-	//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();
 }