maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #42577 from fire/japanese-bone-name-gltf-master

Browse source 
Better non alphanumeric bone names.
This commit is contained in:
Rémi Verschelde 2020-10-05 20:44:50 +02:00 committed by GitHub
parent 437a9393b7 7b76f8783f
commit 437e0be811
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
editor/import/editor_scene_importer_gltf.cpp
View file

@ -184,8 +184,11 @@ String EditorSceneImporterGLTF::_gen_unique_name(GLTFState &state, const String
String EditorSceneImporterGLTF::_sanitize_bone_name(const String &name) {
String p_name = name.camelcase_to_underscore(true);
RegEx pattern_del("([^a-zA-Z0-9_ ])+");
p_name = pattern_del.sub(p_name, "", true);
RegEx pattern_nocolon(":");
p_name = pattern_nocolon.sub(p_name, "_", true);
RegEx pattern_noslash("/");
p_name = pattern_noslash.sub(p_name, "_", true);
RegEx pattern_nospace(" +");
p_name = pattern_nospace.sub(p_name, "_", true);
@ -200,8 +203,10 @@ String EditorSceneImporterGLTF::_sanitize_bone_name(const String &name) {
}
String EditorSceneImporterGLTF::_gen_unique_bone_name(GLTFState &state, const GLTFSkeletonIndex skel_i, const String &p_name) {
const String s_name = _sanitize_bone_name(p_name);
String s_name = _sanitize_bone_name(p_name);
if (s_name.empty()) {
s_name = "bone";
}
String name;
int index = 1;
while (true) {