From 33f1204dc4e919660bd923f366897349a9f9fdbb Mon Sep 17 00:00:00 2001
From: Juan Linietsky
Date: Sun, 26 Jun 2016 15:37:04 -0300
Subject: Fix error reporting when a scene is not imported properly, closes
 #3968

---
 tools/editor/editor_node.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'tools/editor/editor_node.h')

diff --git a/tools/editor/editor_node.h b/tools/editor/editor_node.h
index bea973a35..75565118b 100644
--- a/tools/editor/editor_node.h
+++ b/tools/editor/editor_node.h
@@ -261,7 +261,7 @@ private:
 	TextureProgress *audio_vu;
 	//MenuButton *fileserver_menu;
 
-	TextEdit *load_errors;
+	RichTextLabel *load_errors;
 	AcceptDialog *load_error_dialog;
 
 	//Control *scene_root_base;
@@ -652,7 +652,7 @@ public:
 
 	void fix_dependencies(const String& p_for_file);
 	void clear_scene() { _cleanup_scene(); }
-	Error load_scene(const String& p_scene, bool p_ignore_broken_deps=false, bool p_set_inherited=false);
+	Error load_scene(const String& p_scene, bool p_ignore_broken_deps=false, bool p_set_inherited=false, bool p_clear_errors=true);
 	Error load_resource(const String& p_scene);
 
 	bool is_scene_open(const String& p_path);
-- 
cgit v1.2.3-70-g09d2