diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-02-27 09:22:47 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-27 09:22:47 +0100 |
| commit | 426a6fdc17227715d397f8c09849ce0673b37e64 (patch) | |
| tree | 9661566abc64fb26d2f0aeeec1d8fd35d39660f3 /scene | |
| parent | 0ba75c195efffcb098ac74440ffb0fa9c85d0d96 (diff) | |
| parent | e5f665c7187b6934a71169cab5075f899150f17a (diff) | |
Merge pull request #26134 from marxin/fix-Wsign-compare
Fix -Wsign-compare warnings.
Diffstat (limited to 'scene')
| -rw-r--r-- | scene/3d/voxel_light_baker.cpp | 8 | ||||
| -rw-r--r-- | scene/resources/bit_map.cpp | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/scene/3d/voxel_light_baker.cpp b/scene/3d/voxel_light_baker.cpp index 9250ca7937..750ed97ae6 100644 --- a/scene/3d/voxel_light_baker.cpp +++ b/scene/3d/voxel_light_baker.cpp @@ -887,7 +887,7 @@ void VoxelLightBaker::plot_light_directional(const Vector3 &p_direction, const C distance -= distance_adv; } - if (result == idx) { + if (result == (uint32_t)idx) { //cell hit itself! hooray! Vector3 normal(cells[idx].normal[0], cells[idx].normal[1], cells[idx].normal[2]); @@ -1018,7 +1018,7 @@ void VoxelLightBaker::plot_light_omni(const Vector3 &p_pos, const Color &p_color distance -= distance_adv; } - if (result == idx) { + if (result == (uint32_t)idx) { //cell hit itself! hooray! if (normal == Vector3()) { @@ -1152,7 +1152,7 @@ void VoxelLightBaker::plot_light_spot(const Vector3 &p_pos, const Vector3 &p_axi distance -= distance_adv; } - if (result == idx) { + if (result == (uint32_t)idx) { //cell hit itself! hooray! if (normal == Vector3()) { @@ -2252,7 +2252,7 @@ void VoxelLightBaker::_debug_mesh(int p_idx, int p_level, const AABB &p_aabb, Re uint32_t child = bake_cells[p_idx].children[i]; - if (child == CHILD_EMPTY || child >= max_original_cells) + if (child == CHILD_EMPTY || child >= (uint32_t)max_original_cells) continue; AABB aabb = p_aabb; diff --git a/scene/resources/bit_map.cpp b/scene/resources/bit_map.cpp index 8263096c8f..d2e4d28b44 100644 --- a/scene/resources/bit_map.cpp +++ b/scene/resources/bit_map.cpp @@ -332,7 +332,7 @@ Vector<Vector2> BitMap::_march_square(const Rect2i &rect, const Point2i &start) prevx = stepx; prevy = stepy; - ERR_FAIL_COND_V(count > width * height, _points); + ERR_FAIL_COND_V((int)count > width * height, _points); } while (curx != startx || cury != starty); return _points; } |