diff options
| author | Marius Kintel <marius@kintel.net> | 2013-04-26 21:41:41 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2013-04-26 21:45:40 (GMT) |
| commit | 81266c34a121108e876577cf7dc7c4cf466c15a1 (patch) | |
| tree | d725afd1bdf8e80cb65f4f94416687ce2ead49c3 /src/import.cc | |
| parent | 9b740b558dd627412e01a3521d5372d95e294af2 (diff) | |
Re-added donb's patch for handling deprecated parameters to import
Diffstat (limited to 'src/import.cc')
| -rw-r--r-- | src/import.cc | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/import.cc b/src/import.cc index da79322..bd8f830 100644 --- a/src/import.cc +++ b/src/import.cc @@ -93,10 +93,10 @@ AbstractNode *ImportModule::instantiate(const Context *ctx, const ModuleInstanti Value v = c.lookup_variable("file"); if (v.isUndefined()) { v = c.lookup_variable("filename"); - if (!v.isUndefined()) - PRINT("WARNING: filename= is deprecated. Please use file="); + if (!v.isUndefined()) { + PRINT("DEPRECATED: filename= is deprecated. Please use file="); + } } - std::string filename = inst->getAbsolutePath(v.isUndefined() ? "" : v.toString()); import_type_e actualtype = this->type; if (actualtype == TYPE_UNKNOWN) { @@ -116,9 +116,10 @@ AbstractNode *ImportModule::instantiate(const Context *ctx, const ModuleInstanti node->filename = filename; Value layerval = c.lookup_variable("layer", true); if (layerval.isUndefined()) { - layerval = c.lookup_variable("layername",true); - if (!layerval.isUndefined()) - PRINT("WARNING: layername= is deprecated. Please use layer="); + layerval = c.lookup_variable("layername"); + if (!layerval.isUndefined()) { + PRINT("DEPRECATED: layername= is deprecated. Please use layer="); + } } node->layername = layerval.isUndefined() ? "" : layerval.toString(); node->convexity = c.lookup_variable("convexity", true).toDouble(); |