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

Merge pull request #39533 from hilfazer/editable-children-bugfixes 

Fix Editable Children issues with node renaming, moving, duplicating and instancing.
This commit is contained in:
Rémi Verschelde 2021-01-18 12:31:12 +01:00 committed by GitHub
parent e25984a745 6dbc08668b
commit bc47a8ae00
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
editor/scene_tree_dock.cpp
View File

@ -2183,7 +2183,6 @@ void SceneTreeDock::replace_node(Node *p_node, Node *p_by_node, bool p_keep_prop
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

21
scene/main/node.cpp
View File

@ -1901,37 +1901,23 @@ String Node::get_editor_description() const {
}
void Node::set_editable_instance(Node *p_node, bool p_editable) {
ERR_FAIL_NULL(p_node);
ERR_FAIL_COND(!is_a_parent_of(p_node));
NodePath p = get_path_to(p_node);
if (!p_editable) {
data.editable_instances.erase(p);
p_node->data.editable_instance = false;
// Avoid this flag being needlessly saved;
// also give more visual feedback if editable children is re-enabled
set_display_folded(false);
} else {
data.editable_instances[p] = true;
p_node->data.editable_instance = true;
}
}
bool Node::is_editable_instance(const Node *p_node) const {
if (!p_node)
return false; //easier, null is never editable :)
ERR_FAIL_COND_V(!is_a_parent_of(p_node), false);
NodePath p = get_path_to(p_node);
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;
return p_node->data.editable_instance;
}
void Node::set_scene_instance_state(const Ref<SceneState> &p_state) {
@ -2970,6 +2956,7 @@ Node::Node() {
data.use_placeholder = false;
data.display_folded = false;
data.ready_first = true;
data.editable_instance = false;
orphan_node_count++;
}

5
scene/main/node.h
View File

@ -91,8 +91,6 @@ private:
Ref<SceneState> instance_state;
Ref<SceneState> inherited_state;
HashMap<NodePath, int> editable_instances;
Node *parent;
Node *owner;
Vector<Node *> children; // list of children
@ -139,6 +137,7 @@ private:
bool use_placeholder;
bool display_folded;
bool editable_instance;
mutable NodePath *path_cache;
@ -325,8 +324,6 @@ public:
void set_editable_instance(Node *p_node, bool p_editable);
bool is_editable_instance(const Node *p_node) const;
void set_editable_instances(const HashMap<NodePath, int> &p_editable_instances);
HashMap<NodePath, int> get_editable_instances() const;
/* NOTIFICATIONS */