Merge from V7_2_BR 09/08/2013

diff --git a/src/Controls/Makefile.am b/src/Controls/Makefile.am
index 24b28b1bf0a3d7470e72aeb7a5f937e5ca759d26..59fcdd2910ecdbd0c8a9107404659704f2882c37 100644 (file)
--- a/src/Controls/Makefile.am
+++ b/src/Controls/Makefile.am
@@ -54,7 +54,8 @@ libSMESHControls_la_LDFLAGS = \
        ../SMESHDS/libSMESHDS.la \
        ../SMESHUtils/libSMESHUtils.la \
        $(CAS_LDPATH) -lTKernel -lTKBRep -lTKG3d -lTKTopAlgo -lTKGeomBase -lTKGeomAlgo \
-       $(VTK_LIBS)
+       $(VTK_LIBS) \
+       $(KERNEL_LDFLAGS) -lOpUtil -lSALOMELocalTrace -lSALOMEBasics
 
 SMESHControls_CPPFLAGS = \
        $(libSMESHControls_la_CPPFLAGS)

diff --git a/src/SMDS/SMDS_MeshNode.cxx b/src/SMDS/SMDS_MeshNode.cxx
index 80bbf81c84a68f50461f0c76fe506357d3ce0d18..01a11840625771ba30dfa7db289590e15bddf3d7 100644 (file)
--- a/src/SMDS/SMDS_MeshNode.cxx
+++ b/src/SMDS/SMDS_MeshNode.cxx
@@ -165,7 +165,7 @@ public:
             cellList.push_back(vtkId);
           }
       }
-    myCells = &cellList[0];
+    myCells = cellList.empty() ? 0 : &cellList[0];
     myNcells = cellList.size();
     //MESSAGE("myNcells="<<myNcells);
   }