Nixyri/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-11-24 21:22:48 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #85308 from YuriSizov/editor-fix-animation-backup-copy-crash

Browse Source 
Fix a crash when trying to restore uncopyable animation tracks
This commit is contained in:
Rémi Verschelde 2023-11-24 14:43:04 +01:00 committed by GitHub
commit 1ba920fada
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
scene/animation/animation_mixer.cpp
View File

@ -2143,14 +2143,22 @@ void AnimatedValuesBackup::set_data(const HashMap<NodePath, AnimationMixer::Trac
clear_data(); clear_data();
for (const KeyValue<NodePath, AnimationMixer::TrackCache *> &E : p_data) { for (const KeyValue<NodePath, AnimationMixer::TrackCache *> &E : p_data) {
data.insert(E.key, get_cache_copy(E.value)); AnimationMixer::TrackCache *track = get_cache_copy(E.value);
if (!track) {
continue; // Some types of tracks do not get a copy and must be ignored.
}
data.insert(E.key, track);
} }
} }
HashMap<NodePath, AnimationMixer::TrackCache *> AnimatedValuesBackup::get_data() const { HashMap<NodePath, AnimationMixer::TrackCache *> AnimatedValuesBackup::get_data() const {
HashMap<NodePath, AnimationMixer::TrackCache *> ret; HashMap<NodePath, AnimationMixer::TrackCache *> ret;
for (const KeyValue<NodePath, AnimationMixer::TrackCache *> &E : data) { for (const KeyValue<NodePath, AnimationMixer::TrackCache *> &E : data) {
ret.insert(E.key, get_cache_copy(E.value)); AnimationMixer::TrackCache *track = get_cache_copy(E.value);
ERR_CONTINUE(!track); // Backup shouldn't contain tracks that cannot be copied, this is a mistake.
ret.insert(E.key, track);
} }
return ret; return ret;
} }