diff options
| author | Rémi Verschelde | 2016-07-23 22:53:41 +0200 |
|---|---|---|
| committer | GitHub | 2016-07-23 22:53:41 +0200 |
| commit | 990a23e48ea6dee7d311d450f1032c4e3526b0ac (patch) | |
| tree | 3c981ca8a8cd2b3686f482a3f7b153c8303870d0 /tools/editor/editor_node.cpp | |
| parent | e2644ed188f8325606c896f046d77351e2b3eaa0 (diff) | |
| parent | 53beeb774b36b7af391e61fffeceb9f7ed3e299e (diff) | |
| download | godot-990a23e48ea6dee7d311d450f1032c4e3526b0ac.tar.gz godot-990a23e48ea6dee7d311d450f1032c4e3526b0ac.tar.zst godot-990a23e48ea6dee7d311d450f1032c4e3526b0ac.zip | |
Merge pull request #5821 from TheHX/issue-5795
Improved FileSystem dock "Instance" option
Diffstat (limited to '')
| -rw-r--r-- | tools/editor/editor_node.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/tools/editor/editor_node.cpp b/tools/editor/editor_node.cpp index 8b55e73ee..30b89cacc 100644 --- a/tools/editor/editor_node.cpp +++ b/tools/editor/editor_node.cpp @@ -3822,6 +3822,11 @@ void EditorNode::request_instance_scene(const String &p_path) { } +void EditorNode::request_instance_scenes(const Vector<String>& p_files) { + + scene_tree_dock->instance_scenes(p_files); +} + FileSystemDock *EditorNode::get_scenes_dock() { return scenes_dock; @@ -3831,10 +3836,9 @@ SceneTreeDock *EditorNode::get_scene_tree_dock() { return scene_tree_dock; } -void EditorNode::_instance_request(const String& p_path){ - +void EditorNode::_instance_request(const Vector<String>& p_files) { - request_instance_scene(p_path); + request_instance_scenes(p_files); } void EditorNode::_property_keyed(const String& p_keyed,const Variant& p_value,bool p_advance) { |