diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2021-10-25 17:57:04 +0200 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2021-10-25 17:59:07 +0200 |
| commit | 5ff0624a073fe580b7f26b94f6e242462b67bc2a (patch) | |
| tree | 687bc8f89db74b709e2020228f56b90d8fbc5d75 | |
| parent | 3409d162272ed6a61f1ff896434491364948ee8c (diff) | |
Fix GCC 12 `-Werror=type-limits` in animation compression code
Fixup to #54050, CI's GCC builds didn't catch it.
| -rw-r--r-- | scene/resources/animation.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scene/resources/animation.cpp b/scene/resources/animation.cpp index af2f4cbdb6..f8e4845ae6 100644 --- a/scene/resources/animation.cpp +++ b/scene/resources/animation.cpp @@ -4688,7 +4688,7 @@ bool Animation::_blend_shape_interpolate_compressed(uint32_t p_compressed_track, template <uint32_t COMPONENTS> bool Animation::_fetch_compressed(uint32_t p_compressed_track, double p_time, Vector3i &r_current_value, double &r_current_time, Vector3i &r_next_value, double &r_next_time, uint32_t *key_index) const { ERR_FAIL_COND_V(!compression.enabled, false); - ERR_FAIL_INDEX_V(p_compressed_track, compression.bounds.size(), false); + ERR_FAIL_UNSIGNED_INDEX_V(p_compressed_track, compression.bounds.size(), false); p_time = CLAMP(p_time, 0, length); if (key_index) { *key_index = 0; @@ -4836,7 +4836,7 @@ bool Animation::_fetch_compressed(uint32_t p_compressed_track, double p_time, Ve template <uint32_t COMPONENTS> void Animation::_get_compressed_key_indices_in_range(uint32_t p_compressed_track, double p_time, double p_delta, List<int> *r_indices) const { ERR_FAIL_COND(!compression.enabled); - ERR_FAIL_INDEX(p_compressed_track, compression.bounds.size()); + ERR_FAIL_UNSIGNED_INDEX(p_compressed_track, compression.bounds.size()); double frame_to_sec = 1.0 / double(compression.fps); uint32_t key_index = 0; @@ -4957,7 +4957,7 @@ float Animation::_uncompress_blend_shape(const Vector3i &p_value) const { template <uint32_t COMPONENTS> bool Animation::_fetch_compressed_by_index(uint32_t p_compressed_track, int p_index, Vector3i &r_value, double &r_time) const { ERR_FAIL_COND_V(!compression.enabled, false); - ERR_FAIL_INDEX_V(p_compressed_track, compression.bounds.size(), false); + ERR_FAIL_UNSIGNED_INDEX_V(p_compressed_track, compression.bounds.size(), false); for (uint32_t i = 0; i < compression.pages.size(); i++) { const uint8_t *page_data = compression.pages[i].data.ptr(); |