godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4299 from neikeq/pr-issue-4297 

Keep editable instances data when replacing tree root node
This commit is contained in:
Rémi Verschelde 2016-04-18 08:09:53 +02:00
parent c04b3edac4 3029f5ee02
commit f124b5e0ac
3 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
scene/main/node.cpp
View File

@ -1374,6 +1374,16 @@ bool Node::is_editable_instance(Node *p_node) const {
return data.editable_instances.has(p);
}
void Node::set_editable_instances(const HashMap<NodePath,int>& p_editable_instances) {
data.editable_instances=p_editable_instances;
}
HashMap<NodePath,int> Node::get_editable_instances() const {
return data.editable_instances;
}
#if 0

2
scene/main/node.h
View File

@ -239,6 +239,8 @@ public:
void set_editable_instance(Node* p_node,bool p_editable);
bool is_editable_instance(Node* p_node) const;
void set_editable_instances(const HashMap<NodePath,int>& p_editable_instances);
HashMap<NodePath,int> get_editable_instances() const;
/* NOTIFICATIONS */

1
tools/editor/scene_tree_dock.cpp
View File

@ -1317,6 +1317,7 @@ void SceneTreeDock::_create() {
if (n==edited_scene) {
edited_scene=newnode;
editor->set_edited_scene(newnode);
newnode->set_editable_instances(n->get_editable_instances());
}
//small hack to make collisionshapes and other kind of nodes to work