diff options
| author | Juan Linietsky | 2016-08-02 19:11:47 -0300 |
|---|---|---|
| committer | Juan Linietsky | 2016-08-02 19:11:47 -0300 |
| commit | 3d1d190dcd2993f87d5804de8a60e8bf5fc2cf49 (patch) | |
| tree | aa2c814b744ab970ae79931b419908ff7ebc850e /tools/editor/editor_node.h | |
| parent | ad313097ebcb2a0c02c956fdf74a6610c3f7c9a8 (diff) | |
| parent | cea949180688add09eb9e69f5e405f361dc96d40 (diff) | |
| download | godot-3d1d190dcd2993f87d5804de8a60e8bf5fc2cf49.tar.gz godot-3d1d190dcd2993f87d5804de8a60e8bf5fc2cf49.tar.zst godot-3d1d190dcd2993f87d5804de8a60e8bf5fc2cf49.zip | |
Merge branch 'master' of https://github.com/godotengine/godot
Diffstat (limited to 'tools/editor/editor_node.h')
| -rw-r--r-- | tools/editor/editor_node.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/editor/editor_node.h b/tools/editor/editor_node.h index 9a227d364..793c14867 100644 --- a/tools/editor/editor_node.h +++ b/tools/editor/editor_node.h @@ -452,7 +452,7 @@ private: void _save_scene(String p_file, int idx = -1); - void _instance_request(const String& p_path); + void _instance_request(const Vector<String>& p_files); void _property_keyed(const String& p_keyed, const Variant& p_value, bool p_advance); void _transform_keyed(Object *sp,const String& p_sub,const Transform& p_key); @@ -666,6 +666,7 @@ public: static VSplitContainer *get_top_split() { return singleton->top_split; } void request_instance_scene(const String &p_path); + void request_instance_scenes(const Vector<String>& p_files); FileSystemDock *get_scenes_dock(); SceneTreeDock *get_scene_tree_dock(); static UndoRedo* get_undo_redo() { return &singleton->editor_data.get_undo_redo(); } |