godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-12-02 16:48:55 +00:00
Code Releases Wiki Activity

Merge pull request #9402 from nunodonato/selectimportagain

Browse Source 
Update import dock when editing a resource from the inspector
This commit is contained in:
Rémi Verschelde
2017-06-27 00:09:24 +02:00
committed by GitHub
parent 6f0762ba5d dc18432015
commit f28f2b6ce8
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
editor/editor_node.cpp
View File

@@ -1497,7 +1497,7 @@ void EditorNode::_edit_current() {
property_editor->edit(current_res); property_editor->edit(current_res);
node_dock->set_node(NULL); node_dock->set_node(NULL);
object_menu->set_disabled(false); 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)); //resources_dock->add_resource(Ref<Resource>(current_res));
//top_pallete->set_current_tab(1); //top_pallete->set_current_tab(1);
@@ -1652,7 +1652,6 @@ void EditorNode::_resource_selected(const RES &p_res, const String &p_property)
return; return;
RES r = p_res; RES r = p_res;
EditorNode::get_singleton()->get_import_dock()->set_edit_path(r->get_path());
push_item(r.operator->(), p_property); push_item(r.operator->(), p_property);
} }