diff options
| author | clifford <clifford@b57f626f-c46c-0410-a088-ec61d464b74c> | 2010-02-25 10:21:11 (GMT) |
|---|---|---|
| committer | clifford <clifford@b57f626f-c46c-0410-a088-ec61d464b74c> | 2010-02-25 10:21:11 (GMT) |
| commit | 26cf4309df43667eb763366eb01f873124820d3e (patch) | |
| tree | 4d14628529177d2901c812a03f923eee8e85f537 /src | |
| parent | 01992ecae2226b524e9403065990c22b0ec6858a (diff) | |
Giles Bathgate, Clifford Wolf:
Fixed linear_extrude and rotate_extrude for non-dxf extrudes
git-svn-id: http://svn.clifford.at/openscad/trunk@453 b57f626f-c46c-0410-a088-ec61d464b74c
Diffstat (limited to 'src')
| -rw-r--r-- | src/dxflinextrude.cc | 6 | ||||
| -rw-r--r-- | src/dxfrotextrude.cc | 6 |
2 files changed, 10 insertions, 2 deletions
diff --git a/src/dxflinextrude.cc b/src/dxflinextrude.cc index b1bb6f1..06874ce 100644 --- a/src/dxflinextrude.cc +++ b/src/dxflinextrude.cc @@ -91,7 +91,11 @@ AbstractNode *DxfLinearExtrudeModule::evaluate(const Context *ctx, const ModuleI Value twist = c.lookup_variable("twist", true); Value slices = c.lookup_variable("slices", true); - node->filename = c.get_absolute_path(file.text); + if(!file.text.isNull()) + node->filename = c.get_absolute_path(file.text); + else + node->filename = file.text; + node->layername = layer.text; node->height = height.num; node->convexity = (int)convexity.num; diff --git a/src/dxfrotextrude.cc b/src/dxfrotextrude.cc index 58e6304..b9cbd3b 100644 --- a/src/dxfrotextrude.cc +++ b/src/dxfrotextrude.cc @@ -84,7 +84,11 @@ AbstractNode *DxfRotateExtrudeModule::evaluate(const Context *ctx, const ModuleI Value origin = c.lookup_variable("origin", true); Value scale = c.lookup_variable("scale", true); - node->filename = c.get_absolute_path(file.text); + if(!file.text.isNull()) + node->filename = c.get_absolute_path(file.text); + else + node->filename = file.text; + node->layername = layer.text; node->convexity = (int)convexity.num; origin.getv2(node->origin_x, node->origin_y); |