godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-08 12:40:44 +00:00
Code Releases Wiki Activity

Merge pull request #5821 from TheHX/issue-5795

Browse Source 
Improved FileSystem dock "Instance" option
This commit is contained in:
Rémi Verschelde
2016-07-23 22:53:41 +02:00
committed by GitHub
parent e2644ed188 53beeb774b
commit 990a23e48e
5 changed files with 42 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tools/editor/editor_node.cpp
View File

@@ -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) {