summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2023-01-23 10:24:37 +0100
committerRémi Verschelde <rverschelde@gmail.com>2023-01-23 10:24:37 +0100
commit3a228ef224769793b301062e3ff6c0aed90df845 (patch)
tree08a29fcebf8490d7f3ed9fbfc252c48ed4a4d118
parent5726bf578d9b06bd7a22f1f32e0694550ea64945 (diff)
parent03523572b96f7dd70e0e0c28499f2b33d854e86e (diff)
Merge pull request #71900 from SaracenOne/blendshape_track_import_flag
Fix duplicating imported blendshape tracks
-rw-r--r--modules/gltf/gltf_document.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/modules/gltf/gltf_document.cpp b/modules/gltf/gltf_document.cpp
index 5634c51c61..b243ba933d 100644
--- a/modules/gltf/gltf_document.cpp
+++ b/modules/gltf/gltf_document.cpp
@@ -6072,6 +6072,7 @@ void GLTFDocument::_import_animation(Ref<GLTFState> p_state, AnimationPlayer *p_
const int track_idx = animation->get_track_count();
animation->add_track(Animation::TYPE_BLEND_SHAPE);
animation->track_set_path(track_idx, blend_path);
+ animation->track_set_imported(track_idx, true); //helps merging later
// Only LINEAR and STEP (NEAREST) can be supported out of the box by Godot's Animation,
// the other modes have to be baked.