trying to fix weird GVertex/MVertex association problem

Geo/GModel.cpp

@@ -926,7 +926,7 @@ void GModel::_associateEntityWithMeshVertices()
     _associateEntityWithElementVertices(*it, (*it)->lines);
   }
   for(viter it = firstVertex(); it != lastVertex(); ++it){
-    (*it)->mesh_vertices[0]->setEntity(*it);
+    for(unsigned int i = 0; i < (*it)->mesh_vertices.size(); i++)
+      (*it)->mesh_vertices[i]->setEntity(*it);
   }
 }
-

Geo/GModelIO_Mesh.cpp

@@ -216,7 +216,8 @@ int GModel::readMSH(const std::string &name)
         int num;
         double xyz[3];
         if(!binary){
-          if(fscanf(fp, "%d %lf %lf %lf", &num, &xyz[0], &xyz[1], &xyz[2]) != 4) return 0;
+          if(fscanf(fp, "%d %lf %lf %lf", &num, &xyz[0], &xyz[1], &xyz[2]) != 4)
+	    return 0;
         }
         else{
           if(fread(&num, sizeof(int), 1, fp) != 1) return 0;