asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

-Errors are printed again to Output, after a long time. Fixes #3373

Browse source
This commit is contained in:
Juan Linietsky 2017-08-07 22:51:30 -03:00
parent 2a6cdfaf91
commit f6ad0ccc63
1 changed files with 2 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
editor/editor_log.cpp
View file

@ -52,31 +52,6 @@ void EditorLog::_error_handler(void *p_self, const char *p_func, const char *p_f
*/ */
err_str = " " + err_str; err_str = " " + err_str;
self->log->add_newline();
Ref<Texture> icon;
switch (p_type) {
case ERR_HANDLER_ERROR: {
icon = self->get_icon("Error", "EditorIcons");
return; // these are confusing
} break;
case ERR_HANDLER_WARNING: {
icon = self->get_icon("Error", "EditorIcons");
} break;
case ERR_HANDLER_SCRIPT: {
icon = self->get_icon("ScriptError", "EditorIcons");
} break;
case ERR_HANDLER_SHADER: {
icon = self->get_icon("Shader", "EditorIcons");
} break;
}
self->add_message(err_str, true); self->add_message(err_str, true);
} }
@ -114,16 +89,16 @@ void EditorLog::clear() {
void EditorLog::add_message(const String &p_msg, bool p_error) { void EditorLog::add_message(const String &p_msg, bool p_error) {
log->add_newline();
if (p_error) { if (p_error) {
log->push_color(get_color("fg_error", "Editor"));
Ref<Texture> icon = get_icon("Error", "EditorIcons"); Ref<Texture> icon = get_icon("Error", "EditorIcons");
log->add_image(icon); log->add_image(icon);
//button->set_icon(icon); //button->set_icon(icon);
log->push_color(get_color("fg_error", "Editor"));
} else { } else {
//button->set_icon(Ref<Texture>()); //button->set_icon(Ref<Texture>());
} }
log->add_newline();
log->add_text(p_msg); log->add_text(p_msg);
//button->set_text(p_msg); //button->set_text(p_msg);