diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-03-09 14:54:33 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-09 14:54:33 +0100 |
| commit | 83b1acdc60028ba3368ae841800f5813a1f2e775 (patch) | |
| tree | 7ece3c90c9925f2c9488f7514e84bcbbd6a2c35c /modules/gltf/gltf_document.h | |
| parent | 18bb36707fb7e2d940e3698a7ffa097be23cb69b (diff) | |
| parent | 61cc1c8624cdf2ef56b807c70f76dd96cc0ebcb7 (diff) | |
Merge pull request #45545 from abaire/relaxes_gltf_name_sanitization
Relaxes node name sanitization in gltf documents.
Diffstat (limited to 'modules/gltf/gltf_document.h')
| -rw-r--r-- | modules/gltf/gltf_document.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/modules/gltf/gltf_document.h b/modules/gltf/gltf_document.h index ddf307e6a7..bda1ce87d6 100644 --- a/modules/gltf/gltf_document.h +++ b/modules/gltf/gltf_document.h @@ -162,8 +162,9 @@ private: Error _parse_nodes(Ref<GLTFState> state); String _get_type_name(const GLTFType p_component); String _get_accessor_type_name(const GLTFDocument::GLTFType p_type); - String _sanitize_scene_name(const String &name); String _gen_unique_name(Ref<GLTFState> state, const String &p_name); + String _sanitize_animation_name(const String &name); + String _gen_unique_animation_name(Ref<GLTFState> state, const String &p_name); String _sanitize_bone_name(const String &name); String _gen_unique_bone_name(Ref<GLTFState> state, const GLTFSkeletonIndex skel_i, |