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.h | |
| 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.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(); } |