From: vsr Date: Mon, 12 Aug 2013 10:50:36 +0000 (+0000) Subject: Merge from V7_2_BR 09/08/2013 X-Git-Tag: V7_3_0a1~206 X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=commitdiff_plain;h=4d6cb35b786d3d1686f5416a36623173028958f5 Merge from V7_2_BR 09/08/2013 --- diff --git a/src/Controls/Makefile.am b/src/Controls/Makefile.am index 24b28b1bf..59fcdd291 100644 --- 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 80bbf81c8..01a118406 100644 --- 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="<