Création d'un compte pour un collaborateur extérieur au laboratoire depuis l'intranet ICube : https://intranet.icube.unistra.fr/fr/labs/member/profile

Commit ce753dc9 authored by CGoGN GIT Supervisor's avatar CGoGN GIT Supervisor
Browse files

Merge branch 'master' of /home/kraemer/CGoGN

* 'master' of /home/kraemer/CGoGN:
  delete sparkleshare file
  + ‘.sparkleshare’
  correct CellMarkerBase private copy constructor
parents 7677a0f3 01a19807
...@@ -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);
......
Markdown is supported
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