diff options
| author | Marius Kintel <marius@kintel.net> | 2011-09-11 05:37:14 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2011-09-11 05:37:14 (GMT) |
| commit | 9afeded46c0e9023002dc04ba6131adcb39762b1 (patch) | |
| tree | 0096a12ce36a5b39aa18d7ec5da45c05eb3d42dd /src/surface.cc | |
| parent | b087e68e5430c3dde6adfe452becbaba0f680196 (diff) | |
| parent | dc7eeb30d06a928a30ee47a765be3e5a61288d35 (diff) | |
Merge branch 'polyset-cleanup' into visitor
Diffstat (limited to 'src/surface.cc')
| -rw-r--r-- | src/surface.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/surface.cc b/src/surface.cc index 22598bf..35449ed 100644 --- a/src/surface.cc +++ b/src/surface.cc @@ -62,7 +62,7 @@ public: std::string filename; bool center; int convexity; - virtual PolySet *evaluate_polyset(render_mode_e mode, class PolySetEvaluator *) const; + virtual PolySet *evaluate_polyset(class PolySetEvaluator *) const; }; AbstractNode *SurfaceModule::evaluate(const Context *ctx, const ModuleInstantiation *inst) const @@ -98,17 +98,17 @@ void register_builtin_surface() builtin_modules["surface"] = new SurfaceModule(); } -PolySet *SurfaceNode::evaluate_polyset(render_mode_e, class PolySetEvaluator *) const +PolySet *SurfaceNode::evaluate_polyset(class PolySetEvaluator *) const { - PolySet *p = new PolySet(); handle_dep(filename); QFile f(QString::fromStdString(filename)); if (!f.open(QIODevice::ReadOnly | QIODevice::Text)) { PRINTF("WARNING: Can't open DAT file `%s'.", filename.c_str()); - return p; + return NULL; } + PolySet *p = new PolySet(); int lines = 0, columns = 0; boost::unordered_map<std::pair<int,int>,double> data; double min_val = 0; |