Merge branch 'master' into pre/penta18

[modules/smesh.git] / src / SMDS / SMDSAbs_ElementType.hxx

diff --git a/src/SMDS/SMDSAbs_ElementType.hxx b/src/SMDS/SMDSAbs_ElementType.hxx
index d81f67593e186c0fd539ea223548e5ce327aee4f..491f4f0681a51b1efe00af773b0bb3bbaf9aaa96 100644 (file)
--- a/src/SMDS/SMDSAbs_ElementType.hxx
+++ b/src/SMDS/SMDSAbs_ElementType.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2014  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2016  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -74,8 +74,7 @@ enum SMDSAbs_ElementOrder {
 };
 
 /*!
- * Enumeration of entity type uses in mesh info array,
- *  and should be synchronised with enum in SMDS  
+ * Enumeration of entity type used in mesh info array
  */
 enum SMDSAbs_EntityType {
   SMDSEntity_Node,
@@ -99,6 +98,7 @@ enum SMDSAbs_EntityType {
   SMDSEntity_TriQuad_Hexa,
   SMDSEntity_Penta,
   SMDSEntity_Quad_Penta,
+  SMDSEntity_BiQuad_Penta,
   SMDSEntity_Hexagonal_Prism,
   SMDSEntity_Polyhedra,
   SMDSEntity_Quad_Polyhedra,