diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2016-04-18 08:09:53 +0200 |
|---|---|---|
| committer | Rémi Verschelde <remi@verschelde.fr> | 2016-04-18 08:09:53 +0200 |
| commit | f124b5e0acc0e06eb1e641902c68efd96cf7281a (patch) | |
| tree | b0268c3978fd4dc89f878e814d6df5a2faf5921b | |
| parent | c04b3edac4fb1f99f7a58bb3b634954666db47e6 (diff) | |
| parent | 3029f5ee02483021aadd5d5bc48becb2490791f1 (diff) | |
Merge pull request #4299 from neikeq/pr-issue-4297
Keep editable instances data when replacing tree root node
| -rw-r--r-- | scene/main/node.cpp | 10 | ||||
| -rw-r--r-- | scene/main/node.h | 2 | ||||
| -rw-r--r-- | tools/editor/scene_tree_dock.cpp | 1 |
3 files changed, 13 insertions, 0 deletions
diff --git a/scene/main/node.cpp b/scene/main/node.cpp index b90edb38b2..f4c41256db 100644 --- a/scene/main/node.cpp +++ b/scene/main/node.cpp @@ -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 diff --git a/scene/main/node.h b/scene/main/node.h index 5c6147d644..560a2e588a 100644 --- a/scene/main/node.h +++ b/scene/main/node.h @@ -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 */ diff --git a/tools/editor/scene_tree_dock.cpp b/tools/editor/scene_tree_dock.cpp index 6b2961ea72..c6115ba87a 100644 --- a/tools/editor/scene_tree_dock.cpp +++ b/tools/editor/scene_tree_dock.cpp @@ -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 |