pp

Geo/GFace.cpp

@@ -285,8 +285,10 @@ std::vector<MVertex*> GFace::getEmbeddedMeshVertices() const
   for(std::list<GEdge *>::const_iterator it = embedded_edges.begin();
       it != embedded_edges.end(); it++){
     tmp.insert((*it)->mesh_vertices.begin(), (*it)->mesh_vertices.end());
+    if((*it)->getBeginVertex())
       tmp.insert((*it)->getBeginVertex()->mesh_vertices.begin(),
                  (*it)->getBeginVertex()->mesh_vertices.end());
+    if((*it)->getEndVertex())
       tmp.insert((*it)->getEndVertex()->mesh_vertices.begin(),
                  (*it)->getEndVertex()->mesh_vertices.end());
   }
@@ -1390,8 +1392,8 @@ bool GFace::fillPointCloud(double maxDist,
 
 
 #if defined(HAVE_MESH)
-static void meshCompound (GFace* gf, bool verbose) {
-
+static void meshCompound (GFace* gf, bool verbose)
+{
   discreteFace *df = new discreteFace (gf->model(), gf->tag() + 100000);
 
   std::set<int> ec;
@@ -1403,8 +1405,10 @@ static void meshCompound (GFace* gf, bool verbose) {
       if (found == ec.end())ec.insert((*it)->tag());
       else ec.erase(found);
     }
-    df->triangles.insert(df->triangles.end(), c->triangles.begin(),c->triangles.end());
-    df->mesh_vertices.insert(df->mesh_vertices.end(), c->mesh_vertices.begin(),c->mesh_vertices.end());
+    df->triangles.insert(df->triangles.end(), c->triangles.begin(),
+                         c->triangles.end());
+    df->mesh_vertices.insert(df->mesh_vertices.end(), c->mesh_vertices.begin(),
+                             c->mesh_vertices.end());
     for (unsigned int j=0;j<c->triangles.size();j++)df->_CAD.push_back(c);
     c->triangles.clear();
     c->mesh_vertices.clear();
@@ -1744,7 +1748,6 @@ void GFace::setMeshMaster(GFace* master,const std::map<int,int>& edgeCopies)
   std::map<GVertex*,GVertex*> vs2vt;
 
   for (std::list<GEdge*>::iterator it = l_edges.begin(); it != l_edges.end(); ++it){
-
     // slave edge
     GEdge* le = *it;