Merge pull request #16973 from JFonS/fix_initial_gizmo_visibility

Fix visibility of gizmos on scene load

1 files changed, 6 insertions, 2 deletions

diff --git a/scene/3d/spatial.cpp b/scene/3d/spatial.cpp
index 721641e09b..f8a5c7f400 100644
--- a/scene/3d/spatial.cpp
+++ b/scene/3d/spatial.cpp
@@ -188,7 +188,9 @@ void Spatial::_notification(int p_what) {
 					if (data.gizmo.is_valid()) {
 						data.gizmo->create();
 						if (data.gizmo->can_draw()) {
-							data.gizmo->redraw();
+							if (is_visible_in_tree()) {
+								data.gizmo->redraw();
+							}
 						}
 						data.gizmo->transform();
 					}
@@ -409,7 +411,9 @@ void Spatial::set_gizmo(const Ref<SpatialGizmo> &p_gizmo) {
 
 		data.gizmo->create();
 		if (data.gizmo->can_draw()) {
-			data.gizmo->redraw();
+			if (is_visible_in_tree()) {
+				data.gizmo->redraw();
+			}
 		}
 		data.gizmo->transform();
 	}