diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2016-07-23 22:53:41 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-23 22:53:41 +0200 |
| commit | 990a23e48ea6dee7d311d450f1032c4e3526b0ac (patch) | |
| tree | 3c981ca8a8cd2b3686f482a3f7b153c8303870d0 /tools/editor/scene_tree_dock.h | |
| parent | e2644ed188f8325606c896f046d77351e2b3eaa0 (diff) | |
| parent | 53beeb774b36b7af391e61fffeceb9f7ed3e299e (diff) | |
Merge pull request #5821 from TheHX/issue-5795
Improved FileSystem dock "Instance" option
Diffstat (limited to 'tools/editor/scene_tree_dock.h')
| -rw-r--r-- | tools/editor/scene_tree_dock.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tools/editor/scene_tree_dock.h b/tools/editor/scene_tree_dock.h index 51041a235b..04ed16967f 100644 --- a/tools/editor/scene_tree_dock.h +++ b/tools/editor/scene_tree_dock.h @@ -148,6 +148,8 @@ class SceneTreeDock : public VBoxContainer { void _filter_changed(const String& p_filter); + void _perform_instance_scenes(const Vector<String>& p_files,Node* parent,int p_pos); + protected: void _notification(int p_what); @@ -160,7 +162,7 @@ public: void import_subscene(); void set_edited_scene(Node* p_scene); void instance(const String& p_path); - void instance_scenes(const Vector<String>& p_files,Node* parent,int p_pos); + void instance_scenes(const Vector<String>& p_files, Node *p_parent=NULL); void set_selected(Node *p_node, bool p_emit_selected=false); void fill_path_renames(Node* p_node, Node *p_new_parent, List<Pair<NodePath,NodePath> > *p_renames); void perform_node_renames(Node* p_base,List<Pair<NodePath,NodePath> > *p_renames, Map<Ref<Animation>, Set<int> > *r_rem_anims=NULL); |