diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2022-09-23 09:42:53 +0200 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2022-09-23 09:42:53 +0200 |
| commit | ca88b23a3b13ca155fedde2644b8e4b783e93847 (patch) | |
| tree | eb99db752154d52e20f3006c6fcf7b7729fcf025 /servers/rendering_server.cpp | |
| parent | 43e7db0c69fa3290c43078d7e9512bb525fb7e70 (diff) | |
| parent | d1a155e3cd3214eafe6d157bd235932e4ae6bfe3 (diff) | |
Merge pull request #66248 from akien-mga/warnings-gcc-Wmaybe-uninitialized
Fix various -Wmaybe-uninitialized warnings from GCC 12.2.1
Diffstat (limited to 'servers/rendering_server.cpp')
| -rw-r--r-- | servers/rendering_server.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/servers/rendering_server.cpp b/servers/rendering_server.cpp index b9df0ec8ac..57378708ba 100644 --- a/servers/rendering_server.cpp +++ b/servers/rendering_server.cpp @@ -743,7 +743,7 @@ void RenderingServer::mesh_surface_make_offsets_from_format(uint32_t p_format, i r_attrib_element_size = 0; r_skin_element_size = 0; - uint32_t *size_accum; + uint32_t *size_accum = nullptr; for (int i = 0; i < RS::ARRAY_MAX; i++) { r_offsets[i] = 0; // Reset @@ -847,8 +847,12 @@ void RenderingServer::mesh_surface_make_offsets_from_format(uint32_t p_format, i } } - r_offsets[i] = (*size_accum); - (*size_accum) += elem_size; + if (size_accum != nullptr) { + r_offsets[i] = (*size_accum); + (*size_accum) += elem_size; + } else { + r_offsets[i] = 0; + } } } |