From 81266c34a121108e876577cf7dc7c4cf466c15a1 Mon Sep 17 00:00:00 2001 From: Marius Kintel Date: Fri, 26 Apr 2013 17:41:41 -0400 Subject: [PATCH] Re-added donb's patch for handling deprecated parameters to import --- src/import.cc | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/import.cc b/src/import.cc index da793229..bd8f830d 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();