diff options
author | Marius Kintel <marius@kintel.net> | 2011-10-04 19:06:40 (GMT) |
---|---|---|
committer | Marius Kintel <marius@kintel.net> | 2011-10-04 19:06:40 (GMT) |
commit | 799ca1d1b3f2e9142460ab3ce895a0641f54dfda (patch) | |
tree | 6c168de6d55cb92b94b0ddeb54c668bd4946c10d /src/linearextrude.cc | |
parent | 9259d57659f61e9e56942bb36125f605f8f3c338 (diff) | |
parent | f5e0f3a531b0c8806e4ebc62cd91ca31275ae481 (diff) |
Merge branch 'master' into visitortests
Conflicts:
src/polyset.h
Diffstat (limited to 'src/linearextrude.cc')
-rw-r--r-- | src/linearextrude.cc | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/linearextrude.cc b/src/linearextrude.cc index 4ce87db..5c3b684 100644 --- a/src/linearextrude.cc +++ b/src/linearextrude.cc @@ -30,11 +30,6 @@ #include "context.h" #include "printutils.h" #include "builtin.h" -#include "dxfdata.h" -#include "dxftess.h" -#include "polyset.h" -#include "progress.h" -#include "visitor.h" #include "PolySetEvaluator.h" #include "openscad.h" // get_fragments_from_r() @@ -124,7 +119,7 @@ void register_builtin_dxf_linear_extrude() builtin_modules["linear_extrude"] = new LinearExtrudeModule(); } -PolySet *LinearExtrudeNode::evaluate_polyset(PolySetEvaluator *evaluator) const +class PolySet *LinearExtrudeNode::evaluate_polyset(PolySetEvaluator *evaluator) const { if (!evaluator) { PRINTF("WARNING: No suitable PolySetEvaluator found for %s module!", this->name().c_str()); |