summaryrefslogtreecommitdiff
path: root/tools/editor/editor_node.h
diff options
context:
space:
mode:
authorJuan Linietsky <reduzio@gmail.com>2016-06-26 15:37:04 -0300
committerJuan Linietsky <reduzio@gmail.com>2016-06-26 15:37:39 -0300
commit33f1204dc4e919660bd923f366897349a9f9fdbb (patch)
tree30107c050f467e160482aba7c4d703e55c4e7ae2 /tools/editor/editor_node.h
parent66d513bb2ab86ab75d727cce031cfb226501cab4 (diff)
Fix error reporting when a scene is not imported properly, closes #3968
Diffstat (limited to 'tools/editor/editor_node.h')
-rw-r--r--tools/editor/editor_node.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/editor/editor_node.h b/tools/editor/editor_node.h
index bea973a357..75565118bc 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);