From a572eb6453facaa27860be8e936fea2a0d173e17 Mon Sep 17 00:00:00 2001
From: Poommetee Ketson
Date: Sun, 23 Jul 2017 21:44:42 +0700
Subject: Suppress get_edited_scene_root error

---
 editor/import_dock.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'editor/import_dock.cpp')

diff --git a/editor/import_dock.cpp b/editor/import_dock.cpp
index 24647734c..dff36ae74 100644
--- a/editor/import_dock.cpp
+++ b/editor/import_dock.cpp
@@ -309,6 +309,13 @@ void ImportDock::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("_preset_selected"), &ImportDock::_preset_selected);
 }
 
+void ImportDock::initialize_import_options() const {
+
+	ERR_FAIL_COND(!import_opts || !params);
+
+	import_opts->edit(params);
+}
+
 ImportDock::ImportDock() {
 
 	imported = memnew(LineEdit);
@@ -339,7 +346,6 @@ ImportDock::ImportDock() {
 	hb->add_spacer();
 
 	params = memnew(ImportDockParameters);
-	import_opts->edit(params);
 }
 
 ImportDock::~ImportDock() {
-- 
cgit v1.2.3-70-g09d2