diff options
Diffstat (limited to 'scene/main')
-rw-r--r-- | scene/main/missing_node.cpp | 4 | ||||
-rw-r--r-- | scene/main/missing_node.h | 2 | ||||
-rw-r--r-- | scene/main/shader_globals_override.cpp | 4 | ||||
-rw-r--r-- | scene/main/shader_globals_override.h | 2 | ||||
-rw-r--r-- | scene/main/timer.cpp | 4 | ||||
-rw-r--r-- | scene/main/timer.h | 2 | ||||
-rw-r--r-- | scene/main/viewport.cpp | 6 | ||||
-rw-r--r-- | scene/main/viewport.h | 2 |
8 files changed, 13 insertions, 13 deletions
diff --git a/scene/main/missing_node.cpp b/scene/main/missing_node.cpp index ccb6ac3571..49e565a39c 100644 --- a/scene/main/missing_node.cpp +++ b/scene/main/missing_node.cpp @@ -74,9 +74,9 @@ bool MissingNode::is_recording_properties() const { return recording_properties; } -PackedStringArray MissingNode::get_configuration_warnings() const { +Array MissingNode::get_configuration_warnings() const { // The mere existence of this node is warning. - PackedStringArray ret; + Array ret; ret.push_back(vformat(RTR("This node was saved as class type '%s', which was no longer available when this scene was loaded."), original_class)); ret.push_back(RTR("Data from the original node is kept as a placeholder until this type of node is available again. It can hence be safely re-saved without risk of data loss.")); return ret; diff --git a/scene/main/missing_node.h b/scene/main/missing_node.h index 7fa2c99c96..a56469b8ac 100644 --- a/scene/main/missing_node.h +++ b/scene/main/missing_node.h @@ -55,7 +55,7 @@ public: void set_recording_properties(bool p_enable); bool is_recording_properties() const; - virtual PackedStringArray get_configuration_warnings() const override; + virtual Array get_configuration_warnings() const override; MissingNode(); }; diff --git a/scene/main/shader_globals_override.cpp b/scene/main/shader_globals_override.cpp index e3c26c30e2..b3d3659c5b 100644 --- a/scene/main/shader_globals_override.cpp +++ b/scene/main/shader_globals_override.cpp @@ -271,8 +271,8 @@ void ShaderGlobalsOverride::_notification(int p_what) { } } -PackedStringArray ShaderGlobalsOverride::get_configuration_warnings() const { - PackedStringArray warnings = Node::get_configuration_warnings(); +Array ShaderGlobalsOverride::get_configuration_warnings() const { + Array warnings = Node::get_configuration_warnings(); if (!active) { warnings.push_back(RTR("ShaderGlobalsOverride is not active because another node of the same type is in the scene.")); diff --git a/scene/main/shader_globals_override.h b/scene/main/shader_globals_override.h index d8557ecf6a..72226c0cb3 100644 --- a/scene/main/shader_globals_override.h +++ b/scene/main/shader_globals_override.h @@ -58,7 +58,7 @@ protected: static void _bind_methods(); public: - PackedStringArray get_configuration_warnings() const override; + Array get_configuration_warnings() const override; ShaderGlobalsOverride(); }; diff --git a/scene/main/timer.cpp b/scene/main/timer.cpp index 0f4f18b495..acb788f76f 100644 --- a/scene/main/timer.cpp +++ b/scene/main/timer.cpp @@ -180,8 +180,8 @@ void Timer::_set_process(bool p_process, bool p_force) { processing = p_process; } -PackedStringArray Timer::get_configuration_warnings() const { - PackedStringArray warnings = Node::get_configuration_warnings(); +Array Timer::get_configuration_warnings() const { + Array warnings = Node::get_configuration_warnings(); if (wait_time < 0.05 - CMP_EPSILON) { warnings.push_back(RTR("Very low timer wait times (< 0.05 seconds) may behave in significantly different ways depending on the rendered or physics frame rate.\nConsider using a script's process loop instead of relying on a Timer for very low wait times.")); diff --git a/scene/main/timer.h b/scene/main/timer.h index d16e49793d..add61ef5f4 100644 --- a/scene/main/timer.h +++ b/scene/main/timer.h @@ -73,7 +73,7 @@ public: double get_time_left() const; - PackedStringArray get_configuration_warnings() const override; + Array get_configuration_warnings() const override; void set_timer_process_callback(TimerProcessCallback p_callback); TimerProcessCallback get_timer_process_callback() const; diff --git a/scene/main/viewport.cpp b/scene/main/viewport.cpp index 22418641c0..a2c889dbf7 100644 --- a/scene/main/viewport.cpp +++ b/scene/main/viewport.cpp @@ -3500,9 +3500,9 @@ Variant Viewport::gui_get_drag_data() const { return gui.drag_data; } -PackedStringArray Viewport::get_configuration_warnings() const { - ERR_MAIN_THREAD_GUARD_V(PackedStringArray()); - PackedStringArray warnings = Node::get_configuration_warnings(); +Array Viewport::get_configuration_warnings() const { + ERR_MAIN_THREAD_GUARD_V(Array()); + Array warnings = Node::get_configuration_warnings(); if (size.x <= 1 || size.y <= 1) { warnings.push_back(RTR("The Viewport size must be greater than or equal to 2 pixels on both dimensions to render anything.")); diff --git a/scene/main/viewport.h b/scene/main/viewport.h index 4ac9f18416..6c0ddc0406 100644 --- a/scene/main/viewport.h +++ b/scene/main/viewport.h @@ -611,7 +611,7 @@ public: Control *gui_get_focus_owner() const; Control *gui_get_hovered_control() const; - PackedStringArray get_configuration_warnings() const override; + Array get_configuration_warnings() const override; void set_debug_draw(DebugDraw p_debug_draw); DebugDraw get_debug_draw() const; |