summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
authorEduard Zalyaev <e.zalyaev@innopolis.ru>2022-12-06 19:11:21 +0300
committerEduard Zalyaev <e.zalyaev@innopolis.ru>2022-12-06 19:11:21 +0300
commit627b9ca049b5bec439c2a05642eab6602b2ad630 (patch)
tree947d2280b40af66fa023934c0e6ca35f353ba3ed /modules
parent1db23e472b49eb584d9ee3c59746cc8b59053814 (diff)
EditorSceneFormatImporterGLTF: check if "animation/trimming" parameter from import settings exists
Fixes godotengine#69625
Diffstat (limited to 'modules')
-rw-r--r--modules/gltf/editor/editor_scene_importer_gltf.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/modules/gltf/editor/editor_scene_importer_gltf.cpp b/modules/gltf/editor/editor_scene_importer_gltf.cpp
index 3cf49a3046..a194719b91 100644
--- a/modules/gltf/editor/editor_scene_importer_gltf.cpp
+++ b/modules/gltf/editor/editor_scene_importer_gltf.cpp
@@ -63,7 +63,12 @@ Node *EditorSceneFormatImporterGLTF::import_scene(const String &p_path, uint32_t
if (p_options.has("animation/import")) {
state->set_create_animations(bool(p_options["animation/import"]));
}
- return doc->generate_scene(state, (float)p_options["animation/fps"], (bool)p_options["animation/trimming"]);
+
+ if (p_options.has("animation/trimming")) {
+ return doc->generate_scene(state, (float)p_options["animation/fps"], (bool)p_options["animation/trimming"]);
+ } else {
+ return doc->generate_scene(state, (float)p_options["animation/fps"], false);
+ }
}
#endif // TOOLS_ENABLED