diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-06-11 19:01:26 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-11 19:01:26 +0200 |
| commit | 4043c8a8c980298e22ac0fa7a8955f19411f9148 (patch) | |
| tree | 76829765e10fbf61140f640ff23b8e8ac9958b82 /scene/main | |
| parent | 15425b450f6c531271be637aecd7fe3cb7d314ba (diff) | |
| parent | 6d16f2f053248bff4b72e847904500f760babc35 (diff) | |
Merge pull request #29678 from akien-mga/err-macros-semicolon
Fix error macro calls not ending with semicolon
Diffstat (limited to 'scene/main')
| -rw-r--r-- | scene/main/node.cpp | 4 | ||||
| -rw-r--r-- | scene/main/scene_tree.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/scene/main/node.cpp b/scene/main/node.cpp index 2f23c11748..ee23b24b3c 100644 --- a/scene/main/node.cpp +++ b/scene/main/node.cpp @@ -1165,7 +1165,7 @@ void Node::add_child(Node *p_child, bool p_legible_unique_name) { ERR_FAIL_NULL(p_child); if (p_child == this) { - ERR_EXPLAIN("Can't add child '" + p_child->get_name() + "' to itself.") + ERR_EXPLAIN("Can't add child '" + p_child->get_name() + "' to itself."); ERR_FAIL_COND(p_child == this); // adding to itself! } @@ -1199,7 +1199,7 @@ void Node::add_child_below_node(Node *p_node, Node *p_child, bool p_legible_uniq if (is_a_parent_of(p_node)) { move_child(p_child, p_node->get_position_in_parent() + 1); } else { - WARN_PRINTS("Cannot move under node " + p_node->get_name() + " as " + p_child->get_name() + " does not share a parent.") + WARN_PRINTS("Cannot move under node " + p_node->get_name() + " as " + p_child->get_name() + " does not share a parent."); } } diff --git a/scene/main/scene_tree.cpp b/scene/main/scene_tree.cpp index 65cda73a23..7f0cebd492 100644 --- a/scene/main/scene_tree.cpp +++ b/scene/main/scene_tree.cpp @@ -1244,7 +1244,7 @@ void SceneTree::_update_root_rect() { root->update_canvas_items(); //force them to update just in case if (use_font_oversampling) { - WARN_PRINT("Font oversampling does not work in 'Viewport' stretch mode, only '2D'.") + WARN_PRINT("Font oversampling does not work in 'Viewport' stretch mode, only '2D'."); } } break; |