diff options
| author | TJ <tj8@live.com.au> | 2024-08-06 00:05:10 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-08-05 17:05:10 +0300 |
| commit | db376f2ace28b199749796520966b6e9884985d6 (patch) | |
| tree | e58cb701e5838f3ff796efc35f19563de85a0b96 /indra/newview | |
| parent | 7144fb2359fa0ac64ca7dc8c61bceb0a52015a10 (diff) | |
Fixed unwanted implicit cast from U32 to U16 causing possible crash (#2193, #2194)
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llvosurfacepatch.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llvosurfacepatch.cpp b/indra/newview/llvosurfacepatch.cpp index 471174cf5d..d7fe17c3ce 100644 --- a/indra/newview/llvosurfacepatch.cpp +++ b/indra/newview/llvosurfacepatch.cpp @@ -987,7 +987,7 @@ LLTerrainPartition::LLTerrainPartition(LLViewerRegion* regionp) } // Do not add vertices; honor strict vertex count specified by strider_vertex_count -void gen_terrain_tangents(U16 strider_vertex_count, +void gen_terrain_tangents(U32 strider_vertex_count, U32 strider_index_count, LLStrider<LLVector3> &verticesp, LLStrider<LLVector3> &normalsp, @@ -1003,7 +1003,7 @@ void gen_terrain_tangents(U16 strider_vertex_count, std::vector<LLVector2> texcoords(strider_vertex_count); std::vector<U16> indices(strider_index_count); - for (U16 v = 0; v < strider_vertex_count; ++v) + for (U32 v = 0; v < strider_vertex_count; ++v) { F32 *vert = verticesp[v].mV; vertices[v] = LLVector4a(vert[0], vert[1], vert[2], 1.f); @@ -1019,7 +1019,7 @@ void gen_terrain_tangents(U16 strider_vertex_count, LLCalculateTangentArray(strider_vertex_count, vertices, normals, texcoords.data(), strider_index_count / 3, indices.data(), tangents); - for (U16 v = 0; v < strider_vertex_count; ++v) + for (U32 v = 0; v < strider_vertex_count; ++v) { tangentsp[v] = tangents[v]; } |