diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2016-03-05 01:16:12 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2016-03-05 01:16:12 +0300 |
| commit | 4e500101a7dd3ea578ca6d6f101c0d9ece7f5abc (patch) | |
| tree | b84e5af642e8f702c2bc34a26155a49284fbda9b /source/blender/blenlib/intern/math_geom.c | |
| parent | fea07c1a63fdfe3bf25d77d862e83bdf024347b8 (diff) | |
Cleanup: quiet -Wcomma, cast to void where needed
Diffstat (limited to 'source/blender/blenlib/intern/math_geom.c')
| -rw-r--r-- | source/blender/blenlib/intern/math_geom.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenlib/intern/math_geom.c b/source/blender/blenlib/intern/math_geom.c index 0f586293f57..4bb4e18847d 100644 --- a/source/blender/blenlib/intern/math_geom.c +++ b/source/blender/blenlib/intern/math_geom.c @@ -2811,8 +2811,8 @@ void plot_line_v2v2i(const int p1[2], const int p2[2], bool (*callback)(int, int signed char iy; /* if x1 == x2 or y1 == y2, then it does not matter what we set here */ - int delta_x = (x2 > x1 ? (ix = 1, x2 - x1) : (ix = -1, x1 - x2)) << 1; - int delta_y = (y2 > y1 ? (iy = 1, y2 - y1) : (iy = -1, y1 - y2)) << 1; + int delta_x = (x2 > x1 ? ((void)(ix = 1), x2 - x1) : ((void)(ix = -1), x1 - x2)) << 1; + int delta_y = (y2 > y1 ? ((void)(iy = 1), y2 - y1) : ((void)(iy = -1), y1 - y2)) << 1; if (callback(x1, y1, userData) == 0) { return; |