Skip to content
Browse files

fixed conflict

  • Loading branch information...
1 parent 7375d72 commit ff10729116a8b6408fdef1d962ecb92c3d78efc3 @kintel kintel committed
Showing with 0 additions and 12 deletions.
  1. +0 −12 src/linearextrude.cc
View
12 src/linearextrude.cc
@@ -78,15 +78,6 @@ AbstractNode *LinearExtrudeModule::evaluate(const Context *ctx, const ModuleInst
node->filename = c.getAbsolutePath(file.toString());
}
-<<<<<<< HEAD
- node->layername = layer.isUndefined() ? "" : layer.toString();
- node->height = height.toDouble();
- node->convexity = (int)convexity.toDouble();
- origin.getVec2(node->origin_x, node->origin_y);
- node->scale = scale.toDouble();
-
-=======
->>>>>>> master
// if height not given, and first argument is a number,
// then assume it should be the height.
if (c.lookup_variable("height").isUndefined() &&
@@ -96,15 +87,12 @@ AbstractNode *LinearExtrudeModule::evaluate(const Context *ctx, const ModuleInst
height = Value(inst->argvalues[0]);
}
-<<<<<<< HEAD
-=======
node->layername = layer.isUndefined() ? "" : layer.toString();
node->height = height.toDouble();
node->convexity = (int)convexity.toDouble();
origin.getVec2(node->origin_x, node->origin_y);
node->scale = scale.toDouble();
->>>>>>> master
if (center.type() == Value::BOOL)
node->center = center.toBool();

0 comments on commit ff10729

Please sign in to comment.
Something went wrong with that request. Please try again.