summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <rverschelde@gmail.com>2019-03-16 11:04:03 -0700
committerGitHub <noreply@github.com>2019-03-16 11:04:03 -0700
commitffd115dd6f04abfdabc0d3ed9270b9890815d171 (patch)
tree8e47e96ca82756dd660b74e100a8755fdf7b58af
parent06ebf4c3adbc098964d1b179c8b573b9d1e7c2fd (diff)
parent825a870f06be1603f872ee8bf1989b63d806948f (diff)
Merge pull request #26935 from qarmin/show_class_name_icon_in_tabs
Show in tabs custom class icons
-rw-r--r--editor/editor_node.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp
index b8a91589c5..6140412a32 100644
--- a/editor/editor_node.cpp
+++ b/editor/editor_node.cpp
@@ -136,10 +136,10 @@ void EditorNode::_update_scene_tabs() {
Ref<Texture> script_icon = gui_base->get_icon("Script", "EditorIcons");
for (int i = 0; i < editor_data.get_edited_scene_count(); i++) {
- String type = editor_data.get_scene_type(i);
+ Node *type_node = editor_data.get_edited_scene_root(i);
Ref<Texture> icon;
- if (type != String()) {
- icon = get_class_icon(type, "Node");
+ if (type_node) {
+ icon = EditorNode::get_singleton()->get_object_icon(type_node, "Node");
}
int current = editor_data.get_edited_scene();