diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2024-02-09 18:09:11 +0100 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2024-02-09 18:09:11 +0100 |
| commit | d00dc8facfc343037b29e2eb6e828251e788df24 (patch) | |
| tree | 79e480aca28088bb93451e165ce429374d97e421 /servers/rendering_server.cpp | |
| parent | d87dd6e7797088b57f9636e07d57fc67e0471e24 (diff) | |
| parent | 684752e75bdeb58727c2d9b0ff0265d7fcd47de0 (diff) | |
| download | redot-engine-d00dc8facfc343037b29e2eb6e828251e788df24.tar.gz | |
Merge pull request #87371 from AThousandShips/size_err_check
Replace error checks against `size` with `is_empty`
Diffstat (limited to 'servers/rendering_server.cpp')
| -rw-r--r-- | servers/rendering_server.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/servers/rendering_server.cpp b/servers/rendering_server.cpp index 99b1c5631a..99b0b1886c 100644 --- a/servers/rendering_server.cpp +++ b/servers/rendering_server.cpp @@ -901,7 +901,7 @@ Error RenderingServer::_surface_set_data(Array p_arrays, uint64_t p_format, uint ERR_FAIL_COND_V(p_arrays[ai].get_type() != Variant::PACKED_INT32_ARRAY, ERR_INVALID_PARAMETER); Vector<int> indices = p_arrays[ai]; - ERR_FAIL_COND_V(indices.size() == 0, ERR_INVALID_PARAMETER); + ERR_FAIL_COND_V(indices.is_empty(), ERR_INVALID_PARAMETER); ERR_FAIL_COND_V(indices.size() != p_index_array_len, ERR_INVALID_PARAMETER); /* determine whether using 16 or 32 bits indices */ @@ -1326,7 +1326,7 @@ Error RenderingServer::mesh_create_surface_data_from_arrays(SurfaceData *r_surfa float distance = E; ERR_CONTINUE(distance <= 0.0); Vector<int> indices = p_lods[E]; - ERR_CONTINUE(indices.size() == 0); + ERR_CONTINUE(indices.is_empty()); uint32_t index_count = indices.size(); ERR_CONTINUE(index_count >= (uint32_t)index_array_len); // Should be smaller.. @@ -1781,7 +1781,7 @@ Array RenderingServer::mesh_create_arrays_from_surface_data(const SurfaceData &p Vector<uint8_t> attrib_data = p_data.attribute_data; Vector<uint8_t> skin_data = p_data.skin_data; - ERR_FAIL_COND_V(vertex_data.size() == 0 && (p_data.format & RS::ARRAY_FORMAT_VERTEX), Array()); + ERR_FAIL_COND_V(vertex_data.is_empty() && (p_data.format & RS::ARRAY_FORMAT_VERTEX), Array()); int vertex_len = p_data.vertex_count; Vector<uint8_t> index_data = p_data.index_data; |