godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #88446 from AThousandShips/audio_key_fix 

Fix crash with animation audio track offset
This commit is contained in:
Rémi Verschelde 2024-02-17 18:31:53 +01:00
parent 02f4a66c1f fc3a2933de
commit 4ce5e261b3
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
editor/animation_track_editor.cpp
View File

@ -5907,7 +5907,7 @@ void AnimationTrackEditor::_edit_menu_about_to_popup() {
bool has_length = false; bool has_length = false;
for (const KeyValue<SelectedKey, KeyInfo> &E : selection) { for (const KeyValue<SelectedKey, KeyInfo> &E : selection) {
if (animation->track_get_type(E.key.track) == Animation::TYPE_AUDIO) { if (animation->track_get_type(E.key.track) == Animation::TYPE_AUDIO && animation->audio_track_get_key_stream(E.key.track, E.key.key).is_valid()) {
has_length = true; has_length = true;
break; break;
} }
@ -6247,6 +6247,9 @@ void AnimationTrackEditor::_edit_menu_pressed(int p_option) {
continue; continue;
} }
Ref<AudioStream> stream = animation->audio_track_get_key_stream(E.key.track, E.key.key); Ref<AudioStream> stream = animation->audio_track_get_key_stream(E.key.track, E.key.key);
if (stream.is_null()) {
continue;
}
double len = stream->get_length() - animation->audio_track_get_key_end_offset(E.key.track, E.key.key); double len = stream->get_length() - animation->audio_track_get_key_end_offset(E.key.track, E.key.key);
real_t prev_offset = animation->audio_track_get_key_start_offset(E.key.track, E.key.key); real_t prev_offset = animation->audio_track_get_key_start_offset(E.key.track, E.key.key);
double prev_time = animation->track_get_key_time(E.key.track, E.key.key); double prev_time = animation->track_get_key_time(E.key.track, E.key.key);
@ -6273,6 +6276,9 @@ void AnimationTrackEditor::_edit_menu_pressed(int p_option) {
continue; continue;
} }
Ref<AudioStream> stream = animation->audio_track_get_key_stream(E.key.track, E.key.key); Ref<AudioStream> stream = animation->audio_track_get_key_stream(E.key.track, E.key.key);
if (stream.is_null()) {
continue;
}
double len = stream->get_length() - animation->audio_track_get_key_start_offset(E.key.track, E.key.key); double len = stream->get_length() - animation->audio_track_get_key_start_offset(E.key.track, E.key.key);
real_t prev_offset = animation->audio_track_get_key_end_offset(E.key.track, E.key.key); real_t prev_offset = animation->audio_track_get_key_end_offset(E.key.track, E.key.key);
double prev_time = animation->track_get_key_time(E.key.track, E.key.key); double prev_time = animation->track_get_key_time(E.key.track, E.key.key);