diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2022-07-29 16:56:48 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-29 16:56:48 +0200 |
| commit | 5352cf8e2fafb0c974e3ba68ff8e3c2ce80d449e (patch) | |
| tree | 46e805abdf94246e6e580f1784d9d8f85b03e21f /servers/rendering_server.cpp | |
| parent | 572629d4ee677a834815cdb9c9359fc818d0de59 (diff) | |
| parent | 8d1abe2a00a1d45019e5b1064b3b7e92b0ec80a4 (diff) | |
Merge pull request #46557 from asmaloney/remove-impossible-condition
Remove impossible condition in RenderingServer::mesh_surface_make_offsets_from_format
Diffstat (limited to 'servers/rendering_server.cpp')
| -rw-r--r-- | servers/rendering_server.cpp | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/servers/rendering_server.cpp b/servers/rendering_server.cpp index 6269b05d99..bb76281782 100644 --- a/servers/rendering_server.cpp +++ b/servers/rendering_server.cpp @@ -772,19 +772,11 @@ void RenderingServer::mesh_surface_make_offsets_from_format(uint32_t p_format, i elem_size = 3; } - { - elem_size *= sizeof(float); - } - - if (elem_size == 6) { - elem_size = 8; - } - + elem_size *= sizeof(float); } break; case RS::ARRAY_NORMAL: { elem_size = 4; } break; - case RS::ARRAY_TANGENT: { elem_size = 4; } break; @@ -793,12 +785,9 @@ void RenderingServer::mesh_surface_make_offsets_from_format(uint32_t p_format, i } break; case RS::ARRAY_TEX_UV: { elem_size = 8; - } break; - case RS::ARRAY_TEX_UV2: { elem_size = 8; - } break; case RS::ARRAY_CUSTOM0: case RS::ARRAY_CUSTOM1: |