small fixes

Fltk/graphicWindow.cpp

@@ -1331,9 +1331,8 @@ static void action_point_line_surface_volume(int action, int mode, const char *w
 
     char ib = FlGui::instance()->selectEntity(type);
     if(ib == 'l') {
-      // we don't use List_Insert in order to keep the original
-      // ordering (this is slower, but this way undo works as
-      // expected)
+      // we don't use List_Insert in order to keep the original ordering (this
+      // is slower, but this way undo works as expected)
       int tag;
       switch (type) {
       case ENT_POINT:
@@ -1372,9 +1371,8 @@ static void action_point_line_surface_volume(int action, int mode, const char *w
       drawContext::global()->draw();
     }
     if(ib == 'r') {
-      // we don't use List_Suppress in order to keep the original
-      // ordering (this is slower, but this way undo works as
-      // expected)
+      // we don't use List_Suppress in order to keep the original ordering (this
+      // is slower, but this way undo works as expected)
       int index, tag;
       switch (type) {
       case ENT_POINT:
@@ -1644,8 +1642,9 @@ static void geometry_elementary_boolean_cb(Fl_Widget *w, void *data)
       for(unsigned int i = 0; i < FlGui::instance()->selectedEdges.size(); i++){
         if(FlGui::instance()->selectedEdges[i]->getSelection() != 1){
           FlGui::instance()->selectedEdges[i]->setSelection(1);
-          if(selectObject)
+          if(selectObject){
             object.push_back(FlGui::instance()->selectedEdges[i]);
+          }
           else
             tool.push_back(FlGui::instance()->selectedEdges[i]);
         }
@@ -1670,12 +1669,7 @@ static void geometry_elementary_boolean_cb(Fl_Widget *w, void *data)
       }
     }
     if(ib == 'r') {
-      for(unsigned int i = 0; i < FlGui::instance()->selectedEdges.size(); i++)
-        FlGui::instance()->selectedEdges[i]->setSelection(0);
-      for(unsigned int i = 0; i < FlGui::instance()->selectedFaces.size(); i++)
-        FlGui::instance()->selectedFaces[i]->setSelection(0);
-      for(unsigned int i = 0; i < FlGui::instance()->selectedRegions.size(); i++)
-        FlGui::instance()->selectedRegions[i]->setSelection(0);
+      Msg::Warning("Entity de-selection not implemented yet in boolean operations");
     }
     if(ib == 'u') {
       if(selectObject && object.size()){

Geo/GEdgeLoop.cpp

@@ -141,24 +141,22 @@ GEdgeLoop::GEdgeLoop(const std::list<GEdge*> &cwire)
   GEdge *degeneratedToInsert = 0;
   for (std::list<GEdge*>::const_iterator it = cwire.begin(); it != cwire.end(); ++it){
     GEdge *ed = *it;
-    if (ed->degenerate(0))degenerated.push_back(ed);
+    if (ed->degenerate(0)) degenerated.push_back(ed);
     else wire.push_back(ed);
   }
 
-  if (degenerated.size() == 1){
+  if(degenerated.size() == 1){
     wire.push_front(degenerated[0]);
   }
-  else if (degenerated.size() == 2){
+  else if(degenerated.size() == 2){
     degeneratedToInsert = degenerated[1];
     wire.push_front(degenerated[0]);
   }
   else if (degenerated.size() > 2){
-    Msg::Error("More than two degenerated edges in one model face of an OCC model");
+    Msg::Warning("More than two degenerated edges in one model face of an OCC model");
   }
 
-  while (!wire.empty()){
-    //    printf("wire.size = %d\n",wire.size());
-    loopTheLoop(wire,loop,&degeneratedToInsert);
-    //    break;
+  while(!wire.empty()){
+    loopTheLoop(wire, loop, &degeneratedToInsert);
   }
 }

Geo/OCCEdge.cpp

@@ -263,9 +263,8 @@ int OCCEdge::minimumMeshSegments() const
   else
     np = CTX::instance()->mesh.minCurvPoints - 1;
 
-  // if the edge is closed, ensure that at least 3 points are
-  // generated in the 1D mesh (4 segments, one of which is
-  // degenerated)
+  // if the edge is closed, ensure that at least 3 points are generated in the
+  // 1D mesh (4 segments, one of which is degenerated)
   if (getBeginVertex() == getEndVertex()) np = std::max(4, np);
 
   return std::max(np, meshAttributes.minimumMeshSegments);