diff options
| author | Don Bright <hugh.m.bright@gmail.com> | 2013-12-29 23:20:17 (GMT) |
|---|---|---|
| committer | Don Bright <hugh.m.bright@gmail.com> | 2013-12-29 23:20:17 (GMT) |
| commit | 81a08c05c2d03aa8791279dfbcf7f9ca826fcf96 (patch) | |
| tree | 5177fa483ea81d5b5e6bbdb354425132b4f17478 /src/linearextrude.cc | |
| parent | 316c514208bebc7e5e99aeeaf916c6011a47b5ac (diff) | |
| parent | b272d1f0defa8dd908217ccd43a48eb60735d2d4 (diff) | |
Merge branch 'master' of github.com:openscad/openscad into colorsfix
Diffstat (limited to 'src/linearextrude.cc')
| -rw-r--r-- | src/linearextrude.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/linearextrude.cc b/src/linearextrude.cc index c5d4529..1812504 100644 --- a/src/linearextrude.cc +++ b/src/linearextrude.cc @@ -32,7 +32,7 @@ #include "fileutils.h" #include "builtin.h" #include "PolySetEvaluator.h" -#include "openscad.h" // get_fragments_from_r() +#include "calc.h" #include "mathc99.h" #include <sstream> @@ -113,7 +113,7 @@ AbstractNode *LinearExtrudeModule::instantiate(const Context *ctx, const ModuleI if (slices.type() == Value::NUMBER) { node->slices = (int)slices.toDouble(); } else { - node->slices = (int)fmax(2, fabs(get_fragments_from_r(node->height, + node->slices = (int)fmax(2, fabs(Calc::get_fragments_from_r(node->height, node->fn, node->fs, node->fa) * node->twist / 360)); } node->has_twist = true; |