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

Make conversions from NodePath to String explicit.

Browse Source
This commit is contained in:
Lukas Tenbrink
2025-06-11 16:19:23 +02:00
parent 51b0379e55
commit e2931a5c19
39 changed files with 99 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
editor/import/3d/editor_import_collada.cpp
View File

@ -1565,7 +1565,7 @@ void ColladaImport::create_animation(int p_clip, bool p_import_value_tracks) {
}
NodeMap &nm = node_map[E];
String path = scene->get_path_to(nm.node);
String path = String(scene->get_path_to(nm.node));
if (nm.bone >= 0) {
Skeleton3D *sk = static_cast<Skeleton3D *>(nm.node);
@ -1756,7 +1756,7 @@ void ColladaImport::create_animation(int p_clip, bool p_import_value_tracks) {
}
NodeMap &nm = node_map[at.target];
String path = scene->get_path_to(nm.node);
String path = String(scene->get_path_to(nm.node));
animation->add_track(Animation::TYPE_BLEND_SHAPE);
int track = animation->get_track_count() - 1;

4
editor/import/3d/post_import_plugin_skeleton_renamer.cpp
View File

@ -228,9 +228,9 @@ void PostImportPluginSkeletonRenamer::internal_process(InternalImportCategory p_
}
} else {
if (anim->track_get_path(i).get_subname_count() > 0) {
anim->track_set_path(i, UNIQUE_NODE_PREFIX + unique_name + "/" + node->get_path_to(orig_node) + String(":") + anim->track_get_path(i).get_concatenated_subnames());
anim->track_set_path(i, UNIQUE_NODE_PREFIX + unique_name + "/" + String(node->get_path_to(orig_node)) + String(":") + anim->track_get_path(i).get_concatenated_subnames());
} else {
anim->track_set_path(i, UNIQUE_NODE_PREFIX + unique_name + "/" + node->get_path_to(orig_node));
anim->track_set_path(i, UNIQUE_NODE_PREFIX + unique_name + "/" + String(node->get_path_to(orig_node)));
}
}
break;

6
editor/import/3d/resource_importer_scene.cpp
View File

@ -1062,7 +1062,7 @@ Node *ResourceImporterScene::_pre_fix_animations(Node *p_node, Node *p_root, con
}
}
String import_id = p_node->get_meta("import_id", "PATH:" + p_root->get_path_to(p_node));
String import_id = p_node->get_meta("import_id", "PATH:" + String(p_root->get_path_to(p_node)));
Dictionary node_settings;
if (p_node_data.has(import_id)) {
@ -1110,7 +1110,7 @@ Node *ResourceImporterScene::_post_fix_animations(Node *p_node, Node *p_root, co
}
}
String import_id = p_node->get_meta("import_id", "PATH:" + p_root->get_path_to(p_node));
String import_id = p_node->get_meta("import_id", "PATH:" + String(p_root->get_path_to(p_node)));
Dictionary node_settings;
if (p_node_data.has(import_id)) {
@ -1437,7 +1437,7 @@ Node *ResourceImporterScene::_post_fix_node(Node *p_node, Node *p_root, HashMap<
bool isroot = p_node == p_root;
String import_id = p_node->get_meta("import_id", "PATH:" + p_root->get_path_to(p_node));
String import_id = p_node->get_meta("import_id", "PATH:" + String(p_root->get_path_to(p_node)));
Dictionary node_settings;
if (p_node_data.has(import_id)) {