diff options
| author | Lyuma <xn.lyuma@gmail.com> | 2024-03-30 23:45:22 -0700 |
|---|---|---|
| committer | Lyuma <xn.lyuma@gmail.com> | 2024-03-30 23:45:22 -0700 |
| commit | b0ce274a528d0a8456f984d6814dcef06ee6df56 (patch) | |
| tree | 06146ccf32096166128ef273e2408213c6cc7768 /modules/gltf/editor | |
| parent | 29b3d9e9e538f0aa8effc8ad8bf19a2915292a89 (diff) | |
| download | redot-engine-b0ce274a528d0a8456f984d6814dcef06ee6df56.tar.gz | |
Apply "Remove Immutable Tracks" after post-import.
Reimplements "Remove Immutable" by comparing to the skeleton rest.
It is necessary to delay removing animation tracks until after the correct rest pose is calculated in rest-fixer.
Preserves the original implementation in the GLTFDocument / FBXDocument API for compatibility.
Diffstat (limited to 'modules/gltf/editor')
| -rw-r--r-- | modules/gltf/editor/editor_scene_importer_blend.cpp | 5 | ||||
| -rw-r--r-- | modules/gltf/editor/editor_scene_importer_gltf.cpp | 5 |
2 files changed, 4 insertions, 6 deletions
diff --git a/modules/gltf/editor/editor_scene_importer_blend.cpp b/modules/gltf/editor/editor_scene_importer_blend.cpp index 1b71caef5b..abc89e4e97 100644 --- a/modules/gltf/editor/editor_scene_importer_blend.cpp +++ b/modules/gltf/editor/editor_scene_importer_blend.cpp @@ -301,10 +301,9 @@ Node *EditorSceneFormatImporterBlend::import_scene(const String &p_path, uint32_ #ifndef DISABLE_DEPRECATED bool trimming = p_options.has("animation/trimming") ? (bool)p_options["animation/trimming"] : false; - bool remove_immutable = p_options.has("animation/remove_immutable_tracks") ? (bool)p_options["animation/remove_immutable_tracks"] : true; - return gltf->generate_scene(state, (float)p_options["animation/fps"], trimming, remove_immutable); + return gltf->generate_scene(state, (float)p_options["animation/fps"], trimming, false); #else - return gltf->generate_scene(state, (float)p_options["animation/fps"], (bool)p_options["animation/trimming"], (bool)p_options["animation/remove_immutable_tracks"]); + return gltf->generate_scene(state, (float)p_options["animation/fps"], (bool)p_options["animation/trimming"], false); #endif } diff --git a/modules/gltf/editor/editor_scene_importer_gltf.cpp b/modules/gltf/editor/editor_scene_importer_gltf.cpp index 78beaac3ed..e4ed79d15e 100644 --- a/modules/gltf/editor/editor_scene_importer_gltf.cpp +++ b/modules/gltf/editor/editor_scene_importer_gltf.cpp @@ -72,10 +72,9 @@ Node *EditorSceneFormatImporterGLTF::import_scene(const String &p_path, uint32_t #ifndef DISABLE_DEPRECATED bool trimming = p_options.has("animation/trimming") ? (bool)p_options["animation/trimming"] : false; - bool remove_immutable = p_options.has("animation/remove_immutable_tracks") ? (bool)p_options["animation/remove_immutable_tracks"] : true; - return gltf->generate_scene(state, (float)p_options["animation/fps"], trimming, remove_immutable); + return gltf->generate_scene(state, (float)p_options["animation/fps"], trimming, false); #else - return gltf->generate_scene(state, (float)p_options["animation/fps"], (bool)p_options["animation/trimming"], (bool)p_options["animation/remove_immutable_tracks"]); + return gltf->generate_scene(state, (float)p_options["animation/fps"], (bool)p_options["animation/trimming"], false); #endif } |