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
path: root/extern
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2016-02-20 11:15:51 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2016-02-20 12:06:10 +0300
commitd9bf6b2d3309de0e6c262bf5583c860810c3dc17 (patch)
treef15acc56e88b674268f7aa9caf7e8e49e3cbbf6e /extern
parentf1088bd9e16ea033affeade6b14235b787bb31ad (diff)
Carve: Silence 32/64 bit shit warning
There's no need to mix ints and size_t here at all because all the values fits into integer. It's unlikely we'll be re-bundling Carve, so didn't bother with the patchset.
Diffstat (limited to 'extern')
-rw-r--r--extern/carve/include/carve/mesh_simplify.hpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/extern/carve/include/carve/mesh_simplify.hpp b/extern/carve/include/carve/mesh_simplify.hpp
index 40c90eb763d..9c7371b3df5 100644
--- a/extern/carve/include/carve/mesh_simplify.hpp
+++ b/extern/carve/include/carve/mesh_simplify.hpp
@@ -1341,9 +1341,9 @@ namespace carve {
carve::geom::vector<3> v_best = vert->v;
double d_best = 0.0;
- for (size_t axes = 0; axes < 8; ++axes) {
+ for (int axes = 0; axes < 8; ++axes) {
carve::geom::vector<3> v = vert->v;
- for (size_t N = 0; N < 3; ++N) {
+ for (int N = 0; N < 3; ++N) {
if (constraint & (1 << N)) continue;
if (axes & (1<<N)) {
v.v[N] = ceil(v.v[N] / grid) * grid;
@@ -1471,9 +1471,9 @@ namespace carve {
std::vector<heapval_t> heap;
point_enumerator_t(vector_t _origin, int _base, int _n_dp) : origin(_origin), rounding_fac(pow((double)_base, _n_dp)), last(-1.0, _origin), heap() {
- for (size_t i = 0; i < (1 << 3); ++i) {
+ for (int i = 0; i < (1 << 3); ++i) {
vector_t t = origin;
- for (size_t j = 0; j < 3; ++j) {
+ for (int j = 0; j < 3; ++j) {
if (i & (1U << j)) {
t[j] = ceil(t[j] * rounding_fac) / rounding_fac;
} else {