diff options
| author | Marius Kintel <marius@kintel.net> | 2013-05-09 10:18:51 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2013-05-09 10:18:51 (GMT) |
| commit | f46118da22f806d05b410cced0f9b06ea00ac02c (patch) | |
| tree | e42fece860be6d224744ba5401bf35e783dddd62 /src/import.cc | |
| parent | f8ad66c8bbb3c78548c2e4b3b930f82d4a57b345 (diff) | |
| parent | ad8ba77a15efd745fe7845e085b3daefd3f58e81 (diff) | |
Merge branch 'master' into issue352
Diffstat (limited to 'src/import.cc')
| -rw-r--r-- | src/import.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/import.cc b/src/import.cc index bd8f830..bb44d70 100644 --- a/src/import.cc +++ b/src/import.cc @@ -33,6 +33,7 @@ #include "dxfdata.h" #include "dxftess.h" #include "printutils.h" +#include "fileutils.h" #include "handle_dep.h" // handle_dep() #ifdef ENABLE_CGAL @@ -97,7 +98,7 @@ AbstractNode *ImportModule::instantiate(const Context *ctx, const ModuleInstanti PRINT("DEPRECATED: filename= is deprecated. Please use file="); } } - std::string filename = inst->getAbsolutePath(v.isUndefined() ? "" : v.toString()); + std::string filename = lookup_file(v.isUndefined() ? "" : v.toString(), inst->path(), ctx->documentPath()); import_type_e actualtype = this->type; if (actualtype == TYPE_UNKNOWN) { std::string extraw = boosty::extension_str( fs::path(filename) ); |