maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #9794 from Noshyaar/pr-impd

Browse source 
Suppress get_edited_scene_root error
This commit is contained in:
Rémi Verschelde 2017-07-23 18:23:06 +02:00 committed by GitHub
commit 380e2b9692
3 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
editor/editor_node.cpp
View file

@ -6210,6 +6210,8 @@ EditorNode::EditorNode() {
editor_data.set_edited_scene(0); editor_data.set_edited_scene(0);
_update_scene_tabs(); _update_scene_tabs();
import_dock->initialize_import_options();
{ {
_initializing_addons = true; _initializing_addons = true;

8
editor/import_dock.cpp
View file

@ -309,6 +309,13 @@ void ImportDock::_bind_methods() {
ClassDB::bind_method(D_METHOD("_preset_selected"), &ImportDock::_preset_selected); 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() { ImportDock::ImportDock() {
imported = memnew(LineEdit); imported = memnew(LineEdit);
@ -339,7 +346,6 @@ ImportDock::ImportDock() {
hb->add_spacer(); hb->add_spacer();
params = memnew(ImportDockParameters); params = memnew(ImportDockParameters);
import_opts->edit(params);
} }
ImportDock::~ImportDock() { ImportDock::~ImportDock() {

1
editor/import_dock.h
View file

@ -63,6 +63,7 @@ protected:
public: public:
void set_edit_path(const String &p_path); void set_edit_path(const String &p_path);
void set_edit_multiple_paths(const Vector<String> &p_paths); void set_edit_multiple_paths(const Vector<String> &p_paths);
void initialize_import_options() const;
void clear(); void clear();
ImportDock(); ImportDock();