diff options
| -rw-r--r-- | core/resource.cpp | 2 | ||||
| -rw-r--r-- | editor/script_editor_debugger.cpp | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/core/resource.cpp b/core/resource.cpp index 38f938932c..2eeed50d9d 100644 --- a/core/resource.cpp +++ b/core/resource.cpp @@ -74,7 +74,7 @@ void Resource::set_path(const String &p_path, bool p_take_over) { bool exists = ResourceCache::resources.has(p_path); ResourceCache::lock->read_unlock(); - ERR_EXPLAIN("Another resource is loaded from path: " + p_path); + ERR_EXPLAIN("Another resource is loaded from path: " + p_path + " (possible cyclic resource inclusion)"); ERR_FAIL_COND(exists); } } diff --git a/editor/script_editor_debugger.cpp b/editor/script_editor_debugger.cpp index 629b5b63fb..d0527a13ea 100644 --- a/editor/script_editor_debugger.cpp +++ b/editor/script_editor_debugger.cpp @@ -612,7 +612,9 @@ void ScriptEditorDebugger::_parse_message(const String &p_msg, const Array &p_da if (!EditorNode::get_log()->is_visible()) { if (EditorNode::get_singleton()->are_bottom_panels_hidden()) { - EditorNode::get_singleton()->make_bottom_panel_item_visible(EditorNode::get_log()); + if (EDITOR_GET("run/output/always_open_output_on_play")) { + EditorNode::get_singleton()->make_bottom_panel_item_visible(EditorNode::get_log()); + } } } EditorNode::get_log()->add_message(t); |