Merge remote-tracking branch 'origin/master' into V9_dev

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0a85df880a1a1037b594700779674a12dd242440..ae5c4f9f96d957fbd18cdcf17507def4d4bec0ca 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -31,7 +31,7 @@ ENDIF(WIN32)
 STRING(TOUPPER ${PROJECT_NAME} PROJECT_NAME_UC)
 
 SET(${PROJECT_NAME_UC}_MAJOR_VERSION 8)
-SET(${PROJECT_NAME_UC}_MINOR_VERSION 3)
+SET(${PROJECT_NAME_UC}_MINOR_VERSION 4)
 SET(${PROJECT_NAME_UC}_PATCH_VERSION 0)
 SET(${PROJECT_NAME_UC}_VERSION
   ${${PROJECT_NAME_UC}_MAJOR_VERSION}.${${PROJECT_NAME_UC}_MINOR_VERSION}.${${PROJECT_NAME_UC}_PATCH_VERSION})

diff --git a/src/HEXABLOCK/HexNewShape.cxx b/src/HEXABLOCK/HexNewShape.cxx
index fc4e23f64fe148e0418e5a54950b2dee073398ef..7de14881d2cf56d074906498565a10aa3126b9dc 100755 (executable)
--- a/src/HEXABLOCK/HexNewShape.cxx
+++ b/src/HEXABLOCK/HexNewShape.cxx
@@ -55,8 +55,6 @@
 #include <gp_Lin.hxx>
 #include <gp_Circ.hxx>
 
-#include <Basics_OCCTVersion.hxx>
-
 BEGIN_NAMESPACE_HEXA
 
 static bool db  = on_debug ();  // == getenv ("HEXA_DB") > 0
@@ -179,12 +177,7 @@ int NewShape::transfoShape (Matrix& matrice, SubShape* shape)
    gp_Trsf transfo;
    double             a11,a12,a13,a14, a21,a22,a23,a24, a31,a32,a33,a34;
    matrice.getCoeff  (a11,a12,a13,a14, a21,a22,a23,a24, a31,a32,a33,a34);
-#if OCC_VERSION_LARGE > 0x06070100
    transfo.SetValues (a11,a12,a13,a14, a21,a22,a23,a24, a31,a32,a33,a34);
-#else
-   transfo.SetValues (a11,a12,a13,a14, a21,a22,a23,a24, a31,a32,a33,a34,
-                      Epsil2, Epsil2);
-#endif
 
    TopoDS_Shape shape_orig = shape->getShape ();
    BRepBuilderAPI_Transform builder (shape_orig, transfo, Standard_True);

diff --git a/src/HEXABLOCKGUI/HEXABLOCKGUI_SalomeTools.cxx b/src/HEXABLOCKGUI/HEXABLOCKGUI_SalomeTools.cxx
index 50737eff1afef9dbe1c6b01a96d42f33579f0117..1dae5ca782ea2dfdedc600aabb0c3e7088aaa9be 100644 (file)
--- a/src/HEXABLOCKGUI/HEXABLOCKGUI_SalomeTools.cxx
+++ b/src/HEXABLOCKGUI/HEXABLOCKGUI_SalomeTools.cxx
@@ -28,8 +28,6 @@
 #include <vtkActorCollection.h>
 #include <vtkUnstructuredGrid.h>
 
-#include <Basics_OCCTVersion.hxx>
-
 #include <SUIT_Session.h>
 
 #include <SalomeApp_Application.h>
@@ -173,14 +171,10 @@ namespace GUI
                        Handle(SelectMgr_Selection) sel = theObj->Selection( m );
 
                        for ( sel->Init(); sel->More(); sel->Next() ) {
-#if OCC_VERSION_LARGE > 0x06080100
                                 const Handle(SelectMgr_SensitiveEntity) aHSenEntity = sel->Sensitive();
                                 if ( aHSenEntity.IsNull() )
                                         continue;
                                 Handle(SelectBasics_SensitiveEntity) entity = aHSenEntity->BaseSensitive();
-#else
-                               Handle(SelectBasics_SensitiveEntity) entity = sel->Sensitive();
-#endif
                                if ( entity.IsNull() )
                                        continue;