diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-06-27 00:09:24 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-27 00:09:24 +0200 |
| commit | f28f2b6ce8364b07dac797c1a9e335cb1d331b63 (patch) | |
| tree | 6a438b15ac92116698cd062647bd6a686cdc15a2 | |
| parent | 6f0762ba5dbc78f380798da52b0d66bd2dd44e3b (diff) | |
| parent | dc1843201571707ee09f0592ef3b0cd4232c70b8 (diff) | |
Merge pull request #9402 from nunodonato/selectimportagain
Update import dock when editing a resource from the inspector
| -rw-r--r-- | editor/editor_node.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp index ddf7bc24cb..2c0deb0376 100644 --- a/editor/editor_node.cpp +++ b/editor/editor_node.cpp @@ -1497,7 +1497,7 @@ void EditorNode::_edit_current() { property_editor->edit(current_res); node_dock->set_node(NULL); object_menu->set_disabled(false); - + EditorNode::get_singleton()->get_import_dock()->set_edit_path(r->get_path()); //resources_dock->add_resource(Ref<Resource>(current_res)); //top_pallete->set_current_tab(1); @@ -1652,7 +1652,6 @@ void EditorNode::_resource_selected(const RES &p_res, const String &p_property) return; RES r = p_res; - EditorNode::get_singleton()->get_import_dock()->set_edit_path(r->get_path()); push_item(r.operator->(), p_property); } |