diff options
| author | Don Bright <hugh.m.bright@gmail.com> | 2011-12-07 01:08:51 (GMT) |
|---|---|---|
| committer | Don Bright <hugh.m.bright@gmail.com> | 2011-12-07 01:08:51 (GMT) |
| commit | 2c90eaa189cd5bc96ef56e89f2841d36f54d0ae2 (patch) | |
| tree | 9f732cf3913312bfb99dc79253bef906864c34b5 /src/primitives.cc | |
| parent | 750f3c8fc94744d6cc4c62de6ac86595cb2b38b6 (diff) | |
| parent | bb0ec94290733835df0716531c30460fc5b5210a (diff) | |
Merge remote branch 'upstream/master' into cakebaby
Conflicts:
tests/CMakeLists.txt
tests/csgtestcore.cc
Diffstat (limited to 'src/primitives.cc')
| -rw-r--r-- | src/primitives.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/primitives.cc b/src/primitives.cc index b18a816..67e19c3 100644 --- a/src/primitives.cc +++ b/src/primitives.cc @@ -505,7 +505,7 @@ sphere_next_r2: for (size_t i=0; i<this->points.vec.size(); i++) { double x,y; if (!this->points.vec[i]->getv2(x, y)) { - PRINTF("ERROR: Unable to convert point at index %d to a vec2 of numbers", i); + PRINTF("ERROR: Unable to convert point at index %d to a vec2 of numbers", int(i)); delete p; return NULL; } |