diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2022-09-28 20:47:43 +0200 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2022-09-28 20:47:43 +0200 |
| commit | 0dd308cedd7a8ddd20e93dabe32aef4a9340d5d5 (patch) | |
| tree | f59e56098906e85ea680a1b0a856b61b92dcc572 /modules | |
| parent | d9b251c95c0cb49f3634a5edc087117c4b91ab3a (diff) | |
| parent | d8268aae303d42544eb28a6f86da79e027f4882a (diff) | |
Merge pull request #66545 from akien-mga/msvc-warnings-c4324-c4389-c4456-c4459
Fix MSVC warnings C4324, C4389, C4456, and C4459
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/gridmap/grid_map.cpp | 2 | ||||
| -rw-r--r-- | modules/raycast/SCsub | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/modules/gridmap/grid_map.cpp b/modules/gridmap/grid_map.cpp index 466a2efd21..05ce2b6147 100644 --- a/modules/gridmap/grid_map.cpp +++ b/modules/gridmap/grid_map.cpp @@ -1149,7 +1149,7 @@ TypedArray<Vector3i> GridMap::get_used_cells() const { TypedArray<Vector3i> GridMap::get_used_cells_by_item(int p_item) const { TypedArray<Vector3i> a; for (const KeyValue<IndexKey, Cell> &E : cell_map) { - if (E.value.item == p_item) { + if ((int)E.value.item == p_item) { Vector3i p(E.key.x, E.key.y, E.key.z); a.push_back(p); } diff --git a/modules/raycast/SCsub b/modules/raycast/SCsub index 0670c7f468..20b05816e1 100644 --- a/modules/raycast/SCsub +++ b/modules/raycast/SCsub @@ -79,6 +79,9 @@ if env["builtin_embree"]: else: env.Append(LIBS=["psapi"]) + if env.msvc: # Disable bogus warning about intentional struct padding. + env_raycast.Append(CCFLAGS=["/wd4324"]) + env_thirdparty = env_raycast.Clone() env_thirdparty.force_optimization_on_debug() env_thirdparty.disable_warnings() |