asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #42314 from mbrlabs/nodepath-fix

Browse source 
Fixed renaming/moving of nodes with exported NodePaths in the editor
This commit is contained in:
Rémi Verschelde 2020-10-06 12:04:46 +02:00 committed by GitHub
commit ed333248f5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 27 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
editor/scene_tree_dock.cpp
View file

@ -1318,32 +1318,50 @@ void SceneTreeDock::perform_node_renames(Node *p_base, List<Pair<NodePath, NodeP
if (si) { if (si) {
List<PropertyInfo> properties; List<PropertyInfo> properties;
si->get_property_list(&properties); si->get_property_list(&properties);
NodePath root_path = p_base->get_path();
for (List<PropertyInfo>::Element *E = properties.front(); E; E = E->next()) { for (List<PropertyInfo>::Element *E = properties.front(); E; E = E->next()) {
String propertyname = E->get().name; String propertyname = E->get().name;
Variant p = p_base->get(propertyname); Variant p = p_base->get(propertyname);
if (p.get_type() == Variant::NODE_PATH) { if (p.get_type() == Variant::NODE_PATH) {
NodePath root_path_new = root_path;
for (List<Pair<NodePath, NodePath>>::Element *F = p_renames->front(); F; F = F->next()) {
if (root_path == F->get().first) {
root_path_new = F->get().second;
break;
}
}
// Goes through all paths to check if its matching // Goes through all paths to check if its matching
for (List<Pair<NodePath, NodePath>>::Element *F = p_renames->front(); F; F = F->next()) { for (List<Pair<NodePath, NodePath>>::Element *F = p_renames->front(); F; F = F->next()) {
NodePath root_path = p_base->get_path();
NodePath rel_path_old = root_path.rel_path_to(F->get().first); NodePath rel_path_old = root_path.rel_path_to(F->get().first);
NodePath rel_path_new = F->get().second;
// if not empty, get new relative path
if (F->get().second != NodePath()) {
rel_path_new = root_path.rel_path_to(F->get().second);
}
// if old path detected, then it needs to be replaced with the new one // if old path detected, then it needs to be replaced with the new one
if (p == rel_path_old) { if (p == rel_path_old) {
NodePath rel_path_new = F->get().second;
// if not empty, get new relative path
if (!rel_path_new.is_empty()) {
rel_path_new = root_path_new.rel_path_to(F->get().second);
}
editor_data->get_undo_redo().add_do_property(p_base, propertyname, rel_path_new); editor_data->get_undo_redo().add_do_property(p_base, propertyname, rel_path_new);
editor_data->get_undo_redo().add_undo_property(p_base, propertyname, rel_path_old); editor_data->get_undo_redo().add_undo_property(p_base, propertyname, rel_path_old);
p_base->set(propertyname, rel_path_new); p_base->set(propertyname, rel_path_new);
break; break;
} }
// update if the node itself moved up/down the tree hirarchy
if (root_path == F->get().first) {
NodePath abs_path = NodePath(String(root_path).plus_file(p)).simplified();
NodePath rel_path_new = F->get().second.rel_path_to(abs_path);
editor_data->get_undo_redo().add_do_property(p_base, propertyname, rel_path_new);
editor_data->get_undo_redo().add_undo_property(p_base, propertyname, p);
p_base->set(propertyname, rel_path_new);
}
} }
} }
} }