diff options
| author | Andy Shaw <andy.shaw@qt.io> | 2021-03-04 08:04:19 +0100 |
|---|---|---|
| committer | Andy Shaw <andy.shaw@qt.io> | 2021-03-04 08:04:19 +0100 |
| commit | 2576c8c3a6a5229f7dc99125be8f1b6fad66e7ce (patch) | |
| tree | 2627a42580eff764c235a58af7fb6c917f4b3b42 /code/PostProcessing/ComputeUVMappingProcess.cpp | |
| parent | e09e4ab6708b7eecd70ef0555ef307825b7fbff7 (diff) | |
Compile fix for MSVC 2019
Small is seen as a type with some options so this fixes the errors starting with:
code\PostProcessing\ComputeUVMappingProcess.cpp(125): error C2632: 'int' followed by 'char' is illegal
Diffstat (limited to 'code/PostProcessing/ComputeUVMappingProcess.cpp')
| -rw-r--r-- | code/PostProcessing/ComputeUVMappingProcess.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/code/PostProcessing/ComputeUVMappingProcess.cpp b/code/PostProcessing/ComputeUVMappingProcess.cpp index b722e44f1..8ce3e41c4 100644 --- a/code/PostProcessing/ComputeUVMappingProcess.cpp +++ b/code/PostProcessing/ComputeUVMappingProcess.cpp @@ -122,7 +122,7 @@ void RemoveUVSeams (aiMesh* mesh, aiVector3D* out) const aiFace& face = mesh->mFaces[fidx]; if (face.mNumIndices < 3) continue; // triangles and polygons only, please - unsigned int small = face.mNumIndices, large = small; + unsigned int smallV = face.mNumIndices, large = smallV; bool zero = false, one = false, round_to_zero = false; // Check whether this face lies on a UV seam. We can just guess, @@ -133,7 +133,7 @@ void RemoveUVSeams (aiMesh* mesh, aiVector3D* out) { if (out[face.mIndices[n]].x < LOWER_LIMIT) { - small = n; + smallV = n; // If we have a U value very close to 0 we can't // round the others to 0, too. @@ -151,7 +151,7 @@ void RemoveUVSeams (aiMesh* mesh, aiVector3D* out) one = true; } } - if (small != face.mNumIndices && large != face.mNumIndices) + if (smallV != face.mNumIndices && large != face.mNumIndices) { for (unsigned int n = 0; n < face.mNumIndices;++n) { |