diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-02-11 16:01:55 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-11 16:01:55 +0100 |
| commit | 1eb424ec9549bdd086dfb54c847d107519be73d9 (patch) | |
| tree | d9a3ec0c72f3a4eda02e16ed883f560e02cf1ccf /editor/editor_log.cpp | |
| parent | 3e3f8a47616327d7faeb17f558bb81a943385e82 (diff) | |
| parent | db81928e08cb58d5f67908c6dfcf9433e572ffe8 (diff) | |
Merge pull request #36098 from godotengine/vulkan
Add initial Vulkan support, master branch goes UNSTABLE
Diffstat (limited to 'editor/editor_log.cpp')
| -rw-r--r-- | editor/editor_log.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/editor/editor_log.cpp b/editor/editor_log.cpp index 0495722a13..5b77db7707 100644 --- a/editor/editor_log.cpp +++ b/editor/editor_log.cpp @@ -76,7 +76,7 @@ void EditorLog::_notification(int p_what) { void EditorLog::_clear_request() { log->clear(); - tool_button->set_icon(Ref<Texture>()); + tool_button->set_icon(Ref<Texture2D>()); } void EditorLog::_copy_request() { @@ -102,14 +102,14 @@ void EditorLog::add_message(const String &p_msg, MessageType p_type) { } break; case MSG_TYPE_ERROR: { log->push_color(get_color("error_color", "Editor")); - Ref<Texture> icon = get_icon("Error", "EditorIcons"); + Ref<Texture2D> icon = get_icon("Error", "EditorIcons"); log->add_image(icon); log->add_text(" "); tool_button->set_icon(icon); } break; case MSG_TYPE_WARNING: { log->push_color(get_color("warning_color", "Editor")); - Ref<Texture> icon = get_icon("Warning", "EditorIcons"); + Ref<Texture2D> icon = get_icon("Warning", "EditorIcons"); log->add_image(icon); log->add_text(" "); tool_button->set_icon(icon); |