diff options
author | RĂ©mi Verschelde <rverschelde@gmail.com> | 2019-10-21 22:25:52 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-10-21 22:25:52 +0200 |
commit | affb7fa42334ba5215309d46898dbd41014bdc7e (patch) | |
tree | 367c1869633d90888f98f77f6b84f7af4ccb727e /editor/editor_properties.cpp | |
parent | 53945fe75eb6e76e06222932bd54b4cc7a7ffbaf (diff) | |
parent | a0866716ed9ca061b4be40fb99cd865d2f837313 (diff) |
Merge pull request #32958 from YeldhamDev/inspector_resource_object_icon
Make the the resource menu button fallback to the Object icon instead of Node
Diffstat (limited to 'editor/editor_properties.cpp')
-rw-r--r-- | editor/editor_properties.cpp | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/editor/editor_properties.cpp b/editor/editor_properties.cpp index 9ec9df2ee9..fbb66744a7 100644 --- a/editor/editor_properties.cpp +++ b/editor/editor_properties.cpp @@ -2607,14 +2607,6 @@ void EditorPropertyResource::update_property() { get_tree()->call_deferred("call_group", "_editor_resource_properties", "_fold_other_editors", this); } opened_editor = true; - /* - Button *open_in_editor = memnew(Button); - open_in_editor->set_text(TTR("Open Editor")); - open_in_editor->set_icon(get_icon("Edit", "EditorIcons")); - sub_inspector_vbox->add_child(open_in_editor); - open_in_editor->connect("pressed", this, "_open_editor_pressed"); - open_in_editor->set_h_size_flags(SIZE_SHRINK_CENTER); - */ } } @@ -2644,7 +2636,7 @@ void EditorPropertyResource::update_property() { assign->set_tooltip(""); } else { - assign->set_icon(EditorNode::get_singleton()->get_object_icon(res.operator->(), "Node")); + assign->set_icon(EditorNode::get_singleton()->get_object_icon(res.operator->(), "Object")); if (res->get_name() != String()) { assign->set_text(res->get_name()); |