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/surface.cc | |
| parent | f8ad66c8bbb3c78548c2e4b3b930f82d4a57b345 (diff) | |
| parent | ad8ba77a15efd745fe7845e085b3daefd3f58e81 (diff) | |
Merge branch 'master' into issue352
Diffstat (limited to 'src/surface.cc')
| -rw-r--r-- | src/surface.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/surface.cc b/src/surface.cc index b3246c1..46ddc07 100644 --- a/src/surface.cc +++ b/src/surface.cc @@ -30,6 +30,7 @@ #include "evalcontext.h" #include "builtin.h" #include "printutils.h" +#include "fileutils.h" #include "handle_dep.h" // handle_dep() #include "visitor.h" @@ -82,7 +83,7 @@ AbstractNode *SurfaceModule::instantiate(const Context *ctx, const ModuleInstant c.setVariables(args, evalctx); Value fileval = c.lookup_variable("file"); - node->filename = inst->getAbsolutePath(fileval.isUndefined() ? "" : fileval.toString()); + node->filename = lookup_file(fileval.isUndefined() ? "" : fileval.toString(), inst->path(), c.documentPath()); Value center = c.lookup_variable("center", true); if (center.type() == Value::BOOL) { |