summaryrefslogtreecommitdiff
path: root/tools/editor/scene_tree_dock.h
diff options
context:
space:
mode:
authorFranklin Sobrinho <franklin_gs@hotmail.com>2016-07-20 14:09:03 -0300
committerFranklin Sobrinho <franklin_gs@hotmail.com>2016-07-21 11:10:44 -0300
commit53beeb774b36b7af391e61fffeceb9f7ed3e299e (patch)
tree69598566fc53bd4a7254983e20d87929e4a5d30d /tools/editor/scene_tree_dock.h
parent4abc945466c69426cf4c00ab87d61b927ef1639d (diff)
"FileSystem" dock now instance all selected scenes in one action
Diffstat (limited to 'tools/editor/scene_tree_dock.h')
-rw-r--r--tools/editor/scene_tree_dock.h4
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);