godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix scene dock not showing custom icons

This commit is contained in:
Will Nations 2018-11-10 22:46:20 -06:00
parent c3023e84c2
commit 33e18ab2b5
1 changed files with 21 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
editor/editor_node.cpp
View File

@ -3150,34 +3150,33 @@ Ref<Texture> EditorNode::get_object_icon(const Object *p_object, const String &p
script = p_object; script = p_object;
} }
StringName name;
String icon_path;
if (script.is_valid()) { if (script.is_valid()) {
name = EditorNode::get_editor_data().script_class_get_name(script->get_path()); StringName name = EditorNode::get_editor_data().script_class_get_name(script->get_path());
icon_path = EditorNode::get_editor_data().script_class_get_icon_path(name); String icon_path = EditorNode::get_editor_data().script_class_get_icon_path(name);
name = script->get_instance_base_type();
}
if (gui_base->has_icon(p_object->get_class(), "EditorIcons"))
return gui_base->get_icon(p_object->get_class(), "EditorIcons");
if (icon_path.length()) if (icon_path.length())
return ResourceLoader::load(icon_path); return ResourceLoader::load(icon_path);
if (p_object->has_meta("_editor_icon")) // should probably be deprecated in 4.x
return p_object->get_meta("_editor_icon"); StringName base = script->get_instance_base_type();
if (base != StringName()) {
if (name != StringName()) {
const Map<String, Vector<EditorData::CustomType> > &p_map = EditorNode::get_editor_data().get_custom_types(); const Map<String, Vector<EditorData::CustomType> > &p_map = EditorNode::get_editor_data().get_custom_types();
for (const Map<String, Vector<EditorData::CustomType> >::Element *E = p_map.front(); E; E = E->next()) { for (const Map<String, Vector<EditorData::CustomType> >::Element *E = p_map.front(); E; E = E->next()) {
const Vector<EditorData::CustomType> &ct = E->value(); const Vector<EditorData::CustomType> &ct = E->value();
for (int i = 0; i < ct.size(); ++i) { for (int i = 0; i < ct.size(); ++i) {
if (ct[i].name == name && ct[i].icon.is_valid()) { if (ct[i].name == base && ct[i].icon.is_valid()) {
return ct[i].icon; return ct[i].icon;
} }
} }
} }
} }
}
// should probably be deprecated in 4.x
if (p_object->has_meta("_editor_icon"))
return p_object->get_meta("_editor_icon");
if (gui_base->has_icon(p_object->get_class(), "EditorIcons"))
return gui_base->get_icon(p_object->get_class(), "EditorIcons");
if (p_fallback.length()) if (p_fallback.length())
return gui_base->get_icon(p_fallback, "EditorIcons"); return gui_base->get_icon(p_fallback, "EditorIcons");