diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-03-09 14:27:43 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-09 14:27:43 +0100 |
| commit | 0d728123c674a1ccbbf60707a65016f9c71c3731 (patch) | |
| tree | 7087d16915b6a5b93b9dfb08b7764db8fbe9d9e1 /editor/editor_node.cpp | |
| parent | 9d36ce25e81c6d19e82e87a0468578b12b6b4be8 (diff) | |
| parent | 25f9aee00565996eae4c1cd011c9573a7e37922c (diff) | |
| download | redot-engine-0d728123c674a1ccbbf60707a65016f9c71c3731.tar.gz | |
Merge pull request #26818 from vnen/class_name-inheritance
Allow class_name scripts to have nested inheritance
Diffstat (limited to 'editor/editor_node.cpp')
| -rw-r--r-- | editor/editor_node.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp index f0c9e87b76..1e03adc219 100644 --- a/editor/editor_node.cpp +++ b/editor/editor_node.cpp @@ -3354,7 +3354,7 @@ Ref<Texture> EditorNode::get_class_icon(const String &p_class, const String &p_f icon = ResourceLoader::load(icon_path); } if (!icon.is_valid()) { - icon = gui_base->get_icon(ScriptServer::get_global_class_base(p_class), "EditorIcons"); + icon = gui_base->get_icon(ScriptServer::get_global_class_native_base(p_class), "EditorIcons"); } return icon; } |