Commit ab23f706 authored by untereiner's avatar untereiner
Browse files

Merge cgogn:~kraemer/CGoGN

parents 34034512 cb0ca9b0
...@@ -117,7 +117,7 @@ public: ...@@ -117,7 +117,7 @@ public:
protected: protected:
// protected copy constructor to forbid its usage // protected copy constructor to forbid its usage
CellMarkerBase(const CellMarkerGen& cm) : CellMarkerGen(cm.m_map) CellMarkerBase(const CellMarkerGen& cm) : CellMarkerGen(cm.m_map, CELL)
{} {}
public: public:
......
...@@ -252,7 +252,7 @@ public: ...@@ -252,7 +252,7 @@ public:
*/ */
virtual void unsewVolumes(Dart d); virtual void unsewVolumes(Dart d);
//! Merge to volume along their common oriented face //! Merge two volumes along their common oriented face
/*! @param d a dart of common face /*! @param d a dart of common face
*/ */
virtual bool mergeVolumes(Dart d); virtual bool mergeVolumes(Dart d);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment