mirror/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-12-09 10:09:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #62123 from holgac/bugfix-62097

Browse Source 
Fix infinite loop in animation compress
This commit is contained in:
Rémi Verschelde 2023-01-27 15:42:05 +01:00
commit 1bf7b84fbf
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scene/resources/animation.cpp
View File

@ -4691,6 +4691,7 @@ void Animation::compress(uint32_t p_page_size, uint32_t p_fps, float p_split_tol
data_tracks.resize(tracks_to_compress.size()); data_tracks.resize(tracks_to_compress.size());
time_tracks.resize(tracks_to_compress.size()); time_tracks.resize(tracks_to_compress.size());
uint32_t needed_min_page_size = base_page_size;
for (uint32_t i = 0; i < data_tracks.size(); i++) { for (uint32_t i = 0; i < data_tracks.size(); i++) {
data_tracks[i].split_tolerance = p_split_tolerance; data_tracks[i].split_tolerance = p_split_tolerance;
if (track_get_type(tracks_to_compress[i]) == TYPE_BLEND_SHAPE) { if (track_get_type(tracks_to_compress[i]) == TYPE_BLEND_SHAPE) {
@ -4698,7 +4699,12 @@ void Animation::compress(uint32_t p_page_size, uint32_t p_fps, float p_split_tol
} else { } else {
data_tracks[i].components = 3; data_tracks[i].components = 3;
} }
needed_min_page_size += data_tracks[i].data.size() + data_tracks[i].get_temp_packet_size();
} }
for (uint32_t i = 0; i < time_tracks.size(); i++) {
needed_min_page_size += time_tracks[i].packets.size() * 4; // time packet is 32 bits
}
ERR_FAIL_COND_MSG(p_page_size < needed_min_page_size, "Cannot compress with the given page size");
while (true) { while (true) {
// Begin by finding the keyframe in all tracks with the time closest to the current time // Begin by finding the keyframe in all tracks with the time closest to the current time