diff options
| author | Marius Kintel <marius@kintel.net> | 2012-02-14 00:33:44 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2012-02-14 00:33:44 (GMT) |
| commit | f61c9c9fbc1394f530e8166837ff8d69bf8e2561 (patch) | |
| tree | 1de21c7d0ca5efa6c1af76b94c0c5e95b42233b9 /src/PolySetCGALEvaluator.cc | |
| parent | a83fda0c3d9e92a6e47622cd1c2fdeebdfbb8c1a (diff) | |
| parent | d4efb54284f0781aee40cb660712fa15256676df (diff) | |
Merge branch 'master' of https://github.com/clothbot/openscad into clothbot-master
Conflicts:
scripts/macosx-build-dependencies.sh
Diffstat (limited to 'src/PolySetCGALEvaluator.cc')
| -rw-r--r-- | src/PolySetCGALEvaluator.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/PolySetCGALEvaluator.cc b/src/PolySetCGALEvaluator.cc index c1bdea4..7afb359 100644 --- a/src/PolySetCGALEvaluator.cc +++ b/src/PolySetCGALEvaluator.cc @@ -116,7 +116,7 @@ PolySet *PolySetCGALEvaluator::evaluatePolySet(const ProjectionNode &node) double z = ps3->polygons[i][j][2]; if (z != 0) goto next_ps3_polygon_cut_mode; - if (conversion_grid.align(x, y) == i+1) + if ((unsigned) conversion_grid.align(x, y) == i+1) goto next_ps3_polygon_cut_mode; conversion_grid.data(x, y) = i+1; } |