1 files changed, 21 insertions, 18 deletions

diff --git a/scene/main/shader_globals_override.cpp b/scene/main/shader_globals_override.cpp
index 09dfc50066..ed08c45a01 100644
--- a/scene/main/shader_globals_override.cpp
+++ b/scene/main/shader_globals_override.cpp
@@ -155,7 +155,7 @@ void ShaderGlobalsOverride::_get_property_list(List<PropertyInfo> *p_list) const
 				pinfo.type = Variant::VECTOR3;
 			} break;
 			case RS::GLOBAL_VAR_TYPE_VEC4: {
-				pinfo.type = Variant::PLANE;
+				pinfo.type = Variant::QUATERNION;
 			} break;
 			case RS::GLOBAL_VAR_TYPE_RECT2: {
 				pinfo.type = Variant::RECT2;
@@ -247,26 +247,29 @@ void ShaderGlobalsOverride::_activate() {
 }
 
 void ShaderGlobalsOverride::_notification(int p_what) {
-	if (p_what == Node3D::NOTIFICATION_ENTER_TREE) {
-		add_to_group(SceneStringNames::get_singleton()->shader_overrides_group);
-		_activate();
+	switch (p_what) {
+		case Node3D::NOTIFICATION_ENTER_TREE: {
+			add_to_group(SceneStringNames::get_singleton()->shader_overrides_group);
+			_activate();
+		} break;
 
-	} else if (p_what == Node3D::NOTIFICATION_EXIT_TREE) {
-		if (active) {
-			//remove overrides
-			const StringName *K = nullptr;
-			while ((K = overrides.next(K))) {
-				Override *o = overrides.getptr(*K);
-				if (o->in_use) {
-					RS::get_singleton()->global_variable_set_override(*K, Variant());
+		case Node3D::NOTIFICATION_EXIT_TREE: {
+			if (active) {
+				//remove overrides
+				const StringName *K = nullptr;
+				while ((K = overrides.next(K))) {
+					Override *o = overrides.getptr(*K);
+					if (o->in_use) {
+						RS::get_singleton()->global_variable_set_override(*K, Variant());
+					}
 				}
 			}
-		}
 
-		remove_from_group(SceneStringNames::get_singleton()->shader_overrides_group_active);
-		remove_from_group(SceneStringNames::get_singleton()->shader_overrides_group);
-		get_tree()->call_group(SceneStringNames::get_singleton()->shader_overrides_group, "_activate"); //another may want to activate when this is removed
-		active = false;
+			remove_from_group(SceneStringNames::get_singleton()->shader_overrides_group_active);
+			remove_from_group(SceneStringNames::get_singleton()->shader_overrides_group);
+			get_tree()->call_group_flags(SceneTree::GROUP_CALL_DEFERRED, SceneStringNames::get_singleton()->shader_overrides_group, "_activate"); //another may want to activate when this is removed
+			active = false;
+		} break;
 	}
 }
 
@@ -274,7 +277,7 @@ TypedArray<String> ShaderGlobalsOverride::get_configuration_warnings() const {
 	TypedArray<String> warnings = Node::get_configuration_warnings();
 
 	if (!active) {
-		warnings.push_back(TTR("ShaderGlobalsOverride is not active because another node of the same type is in the scene."));
+		warnings.push_back(RTR("ShaderGlobalsOverride is not active because another node of the same type is in the scene."));
 	}
 
 	return warnings;