Permalink
Browse files

Merge branch 'master' into lion

  • Loading branch information...
2 parents f3dcc20 + f533757 commit 11ffcd2ec8495dd268a2cc8fda4beb18bec7eff4 @kintel kintel committed Aug 18, 2012
Showing with 2 additions and 2 deletions.
  1. +1 −1 src/csgterm.cc
  2. +1 −1 src/csgterm.h
View
@@ -178,7 +178,7 @@ void CSGChain::import(shared_ptr<CSGTerm> term, CSGTerm::type_e type)
}
}
-std::string CSGChain::dump(bool full=false)
+std::string CSGChain::dump(bool full)
{
std::stringstream dump;
View
@@ -59,7 +59,7 @@ class CSGChain
void add(const shared_ptr<PolySet> &polyset, const Transform3d &m, const Color4f &color, CSGTerm::type_e type, std::string label);
void import(shared_ptr<CSGTerm> term, CSGTerm::type_e type = CSGTerm::TYPE_UNION);
- std::string dump(bool full);
+ std::string dump(bool full = false);
BoundingBox getBoundingBox() const;
};

0 comments on commit 11ffcd2

Please sign in to comment.