vitalif
/
openscad
mirror of https://github.com/vitalif/openscad
1
0
Fork 0
Code Issues Releases Wiki Activity

Re-added donb's patch for handling deprecated parameters to import

felipesanches-svg
Marius Kintel 2013-04-26 17:41:41 -04:00
parent 9b740b558d
commit 81266c34a1
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/import.cc
View File

@ -93,10 +93,10 @@ AbstractNode *ImportModule::instantiate(const Context *ctx, const ModuleInstanti
Value v = c.lookup_variable("file"); Value v = c.lookup_variable("file");
if (v.isUndefined()) { if (v.isUndefined()) {
v = c.lookup_variable("filename"); v = c.lookup_variable("filename");
if (!v.isUndefined()) if (!v.isUndefined()) {
PRINT("WARNING: filename= is deprecated. Please use file="); PRINT("DEPRECATED: filename= is deprecated. Please use file=");
}
} }
std::string filename = inst->getAbsolutePath(v.isUndefined() ? "" : v.toString()); std::string filename = inst->getAbsolutePath(v.isUndefined() ? "" : v.toString());
import_type_e actualtype = this->type; import_type_e actualtype = this->type;
if (actualtype == TYPE_UNKNOWN) { if (actualtype == TYPE_UNKNOWN) {
@ -116,9 +116,10 @@ AbstractNode *ImportModule::instantiate(const Context *ctx, const ModuleInstanti
node->filename = filename; node->filename = filename;
Value layerval = c.lookup_variable("layer", true); Value layerval = c.lookup_variable("layer", true);
if (layerval.isUndefined()) { if (layerval.isUndefined()) {
layerval = c.lookup_variable("layername",true); layerval = c.lookup_variable("layername");
if (!layerval.isUndefined()) if (!layerval.isUndefined()) {
PRINT("WARNING: layername= is deprecated. Please use layer="); PRINT("DEPRECATED: layername= is deprecated. Please use layer=");
}
} }
node->layername = layerval.isUndefined() ? "" : layerval.toString(); node->layername = layerval.isUndefined() ? "" : layerval.toString();
node->convexity = c.lookup_variable("convexity", true).toDouble(); node->convexity = c.lookup_variable("convexity", true).toDouble();