diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-09-12 12:04:03 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-12 12:04:03 +0200 |
| commit | 0f006994d8be89e3c06bbec50eeab6746b17865c (patch) | |
| tree | b0a0270b2c139b2af1114e760181bbc6e71f1a43 | |
| parent | ee581e1fedaa4eba7b3af3037ef049873d265934 (diff) | |
| parent | 0549484c7708febba7055ccf28a2aeed051c1dc4 (diff) | |
Merge pull request #11007 from saltares/issue-9988
Renames _add_child_below_node() to add_child_below_node(). Fixes #9988.
| -rw-r--r-- | editor/scene_tree_dock.cpp | 2 | ||||
| -rwxr-xr-x | scene/main/node.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/editor/scene_tree_dock.cpp b/editor/scene_tree_dock.cpp index 6fd35d4ca1..5b783493cb 100644 --- a/editor/scene_tree_dock.cpp +++ b/editor/scene_tree_dock.cpp @@ -433,7 +433,7 @@ void SceneTreeDock::_tool_selected(int p_tool, bool p_confirm_override) { dup->set_name(parent->validate_child_name(dup)); - editor_data->get_undo_redo().add_do_method(parent, "_add_child_below_node", node, dup); + editor_data->get_undo_redo().add_do_method(parent, "add_child_below_node", node, dup); for (List<Node *>::Element *F = owned.front(); F; F = F->next()) { if (!duplimap.has(F->get())) { diff --git a/scene/main/node.cpp b/scene/main/node.cpp index a543dba9cb..d3a0857b16 100755 --- a/scene/main/node.cpp +++ b/scene/main/node.cpp @@ -2674,7 +2674,7 @@ void Node::_bind_methods() { GLOBAL_DEF("node/name_casing", NAME_CASING_PASCAL_CASE); ProjectSettings::get_singleton()->set_custom_property_info("node/name_casing", PropertyInfo(Variant::INT, "node/name_casing", PROPERTY_HINT_ENUM, "PascalCase,camelCase,snake_case")); - ClassDB::bind_method(D_METHOD("_add_child_below_node", "node", "child_node", "legible_unique_name"), &Node::add_child_below_node, DEFVAL(false)); + ClassDB::bind_method(D_METHOD("add_child_below_node", "node", "child_node", "legible_unique_name"), &Node::add_child_below_node, DEFVAL(false)); ClassDB::bind_method(D_METHOD("set_name", "name"), &Node::set_name); ClassDB::bind_method(D_METHOD("get_name"), &Node::get_name); |