diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-02-13 14:28:05 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-13 14:28:05 +0100 |
| commit | dcfe44f4479ddbf3518d3e753fbf242845402ae4 (patch) | |
| tree | 08e9b17099079836ffae47c4cf234d0bd115c909 /editor | |
| parent | 835406cf04f0200a0504ae171964c687c559eb1e (diff) | |
| parent | 54ac8eaba661a599983ae4774113d1a15cfa461a (diff) | |
Merge pull request #36175 from akien-mga/remove-more-deprecated-stuff
Remove deprecated methods and code
Diffstat (limited to 'editor')
| -rw-r--r-- | editor/scene_tree_editor.cpp | 25 |
1 files changed, 1 insertions, 24 deletions
diff --git a/editor/scene_tree_editor.cpp b/editor/scene_tree_editor.cpp index c168418972..a0b846beb0 100644 --- a/editor/scene_tree_editor.cpp +++ b/editor/scene_tree_editor.cpp @@ -187,19 +187,11 @@ bool SceneTreeEditor::_add_nodes(Node *p_node, TreeItem *p_parent) { TreeItem *item = tree->create_item(p_parent); item->set_text(0, p_node->get_name()); - if (can_rename && !part_of_subscene /*(p_node->get_owner() == get_scene_node() || p_node==get_scene_node())*/) + if (can_rename && !part_of_subscene) item->set_editable(0, true); item->set_selectable(0, true); if (can_rename) { -#ifndef DISABLE_DEPRECATED - if (p_node->has_meta("_editor_collapsed")) { - //remove previous way of storing folding, which did not get along with scene inheritance and instancing - if ((bool)p_node->get_meta("_editor_collapsed")) - p_node->set_display_folded(true); - p_node->set_meta("_editor_collapsed", Variant()); - } -#endif bool collapsed = p_node->is_displayed_folded(); if (collapsed) item->set_collapsed(true); @@ -497,21 +489,6 @@ void SceneTreeEditor::_node_script_changed(Node *p_node) { MessageQueue::get_singleton()->push_call(this, "_update_tree"); tree_dirty = true; - /* - changes the order :| - TreeItem* item=p_node?_find(tree->get_root(),p_node->get_path()):NULL; - if (p_node->get_script().is_null()) { - - int idx=item->get_button_by_id(0,2); - if (idx>=0) - item->erase_button(0,idx); - } else { - - int idx=item->get_button_by_id(0,2); - if (idx<0) - item->add_button(0,get_icon("Script","EditorIcons"),2); - - }*/ } void SceneTreeEditor::_node_removed(Node *p_node) { |