summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHein-Pieter van Braam <hp@tmm.cx>2018-07-29 04:14:57 +0200
committerHein-Pieter van Braam <hp@tmm.cx>2018-07-29 04:14:57 +0200
commit5c88bc66e3a9dbfc4cd9d9a1ad8c7fc07c299a34 (patch)
tree69f52f53518a5380815efdbeb537199b8b58b9e0
parentfeaf03421dda0213382b51aff07bd5a96b29487b (diff)
Undo an accidental revert.
Sorry for the history pollution. I was testing something on this branch and forgot to reset befor pushing the security update. This reverts commit 2ef66def4615594b87340aed2b02adf2204c74c2.
-rw-r--r--editor/editor_properties.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/editor/editor_properties.cpp b/editor/editor_properties.cpp
index e77fcadeed..79490f1c8e 100644
--- a/editor/editor_properties.cpp
+++ b/editor/editor_properties.cpp
@@ -2173,7 +2173,7 @@ void EditorPropertyResource::_sub_inspector_object_id_selected(int p_id) {
void EditorPropertyResource::_open_editor_pressed() {
RES res = get_edited_object()->get(get_edited_property());
if (res.is_valid()) {
- EditorNode::get_singleton()->edit_item(res.ptr());
+ EditorNode::get_singleton()->edit_resource(res.ptr());
}
}