diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-04-12 09:40:55 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-12 09:40:55 +0200 |
| commit | cee5414698b14be3ce837b4c9de3a3d500d28611 (patch) | |
| tree | c6ef3961655e03dc601ac826f28206844876e1cb /editor | |
| parent | 184abce1928e694bc884537cf0d5ef42333ba10d (diff) | |
| parent | 2a8c59c171e609d739dcc59d15e3e205dbf47cde (diff) | |
Merge pull request #43180 from nathanfranke/node-configuration-array
Use Array for node configuration warnings
Diffstat (limited to 'editor')
| -rw-r--r-- | editor/scene_tree_editor.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/editor/scene_tree_editor.cpp b/editor/scene_tree_editor.cpp index b5e9aec854..ec37fa53b3 100644 --- a/editor/scene_tree_editor.cpp +++ b/editor/scene_tree_editor.cpp @@ -120,7 +120,7 @@ void SceneTreeEditor::_cell_button_pressed(Object *p_item, int p_column, int p_i } undo_redo->commit_action(); } else if (p_id == BUTTON_WARNING) { - String config_err = n->get_configuration_warning(); + String config_err = n->get_configuration_warnings_as_string(); if (config_err == String()) { return; } @@ -252,9 +252,9 @@ bool SceneTreeEditor::_add_nodes(Node *p_node, TreeItem *p_parent, bool p_scroll if (can_rename) { //should be can edit.. - String warning = p_node->get_configuration_warning(); + String warning = p_node->get_configuration_warnings_as_string(); if (!warning.is_empty()) { - item->add_button(0, get_theme_icon("NodeWarning", "EditorIcons"), BUTTON_WARNING, false, TTR("Node configuration warning:") + "\n" + p_node->get_configuration_warning()); + item->add_button(0, get_theme_icon("NodeWarning", "EditorIcons"), BUTTON_WARNING, false, TTR("Node configuration warning:") + "\n" + warning); } int num_connections = p_node->get_persistent_signal_connection_count(); |