Merge branch 'V9_13_BR'

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 583b992ea3fcb39c7baf00e241ba515ef8e34f05..7747bf989548d4cd6f001fd3af4977feffc79979 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -39,7 +39,7 @@ ENDIF()
 
 # Versioning
 # ===========
-SALOME_SETUP_VERSION(9.12.0)
+SALOME_SETUP_VERSION(9.13.0)
 MESSAGE(STATUS "Building ${PROJECT_NAME_UC} ${${PROJECT_NAME_UC}_VERSION} from \"${${PROJECT_NAME_UC}_GIT_SHA1}\"")
 
 # Find KERNEL

diff --git a/src/GMSHPlugin/GMSHPlugin_Mesher.cxx b/src/GMSHPlugin/GMSHPlugin_Mesher.cxx
index efb85605fb7f2a0a063076c96acd117482c6edec..8814f9d99f3f396afbd2676aebe1339ad8ed89ed 100644 (file)
--- a/src/GMSHPlugin/GMSHPlugin_Mesher.cxx
+++ b/src/GMSHPlugin/GMSHPlugin_Mesher.cxx
@@ -1152,12 +1152,15 @@ void GMSHPlugin_Mesher::FillSMesh()
       MVertex *v = gFace->mesh_vertices[i];
       if ( v->getIndex() >= 0 )
       {
+        double U,V;
+        gFace->XYZtoUV( v->x(),v->y(),v->z(), U, V, 1.0 );
+
         SMDS_MeshNode *node = meshDS->AddNode( v->x(),v->y(),v->z() );
 
         if ( isCompound )
           topoFace = TopoDS::Face( getShapeAtPoint( v->point(), topoFaces ));
 
-        meshDS->SetNodeOnFace( node, topoFace );
+        meshDS->SetNodeOnFace( node, topoFace, U, V );
         _nodeMap.insert({ v, node });
       }
     }
@@ -1204,7 +1207,9 @@ void GMSHPlugin_Mesher::FillSMesh()
         if(verts[j]->onWhat()->getVisibility() == 0)
         {
           SMDS_MeshNode *node = meshDS->AddNode(verts[j]->x(),verts[j]->y(),verts[j]->z());
-          meshDS->SetNodeOnFace( node, topoFace );
+          double U,V;
+          gFace->XYZtoUV( verts[j]->x(),verts[j]->y(),verts[j]->z(), U, V, 1.0 );
+          meshDS->SetNodeOnFace( node, topoFace, U, V );
           _nodeMap.insert({ verts[j], node });
           verts[j]->setEntity(gFace);
         }