Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'source/blender/freestyle/intern/view_map/SphericalGrid.cpp')
-rw-r--r--source/blender/freestyle/intern/view_map/SphericalGrid.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/freestyle/intern/view_map/SphericalGrid.cpp b/source/blender/freestyle/intern/view_map/SphericalGrid.cpp
index 5e27e344c28..6d800d13b3b 100644
--- a/source/blender/freestyle/intern/view_map/SphericalGrid.cpp
+++ b/source/blender/freestyle/intern/view_map/SphericalGrid.cpp
@@ -124,7 +124,7 @@ void SphericalGrid::assignCells(OccluderSource & /*source*/,
++f) {
if ((*f)->isInImage()) {
Vec3r point = SphericalGrid::Transform::sphericalProjection((*f)->center3d());
- unsigned i, j;
+ uint i, j;
getCellCoordinates(point, i, j);
if (_cells[i * _cellsY + j] == nullptr) {
// This is an uninitialized cell
@@ -182,15 +182,15 @@ void SphericalGrid::reorganizeCells()
}
}
-void SphericalGrid::getCellCoordinates(const Vec3r &point, unsigned &x, unsigned &y)
+void SphericalGrid::getCellCoordinates(const Vec3r &point, uint &x, uint &y)
{
- x = min(_cellsX - 1, (unsigned)floor(max(double(0.0f), point[0] - _cellOrigin[0]) / _cellSize));
- y = min(_cellsY - 1, (unsigned)floor(max(double(0.0f), point[1] - _cellOrigin[1]) / _cellSize));
+ x = min(_cellsX - 1, uint(floor(max(double(0.0f), point[0] - _cellOrigin[0]) / _cellSize)));
+ y = min(_cellsY - 1, uint(floor(max(double(0.0f), point[1] - _cellOrigin[1]) / _cellSize)));
}
SphericalGrid::Cell *SphericalGrid::findCell(const Vec3r &point)
{
- unsigned x, y;
+ uint x, y;
getCellCoordinates(point, x, y);
return _cells[x * _cellsY + y];
}