merge master

diff --cc src/Tools/blocFissure/CMakeLists.txt
Simple merge

diff --cc src/Tools/blocFissure/CasTests/CMakeLists.txt
Simple merge

diff --cc src/Tools/blocFissure/gmu/CMakeLists.txt
Simple merge

diff --cc src/Tools/blocFissure/gmu/triedreBase.py
index 068ca40b7a40b22aaf24adce51d8a769418ab55f,ffc3a1b329aa759d4e5062bb7a95cdee2424a4e2..8113cd077eecff59ca66b848cbc0149ccb48c1bf
--- 1/src/Tools/blocFissure/gmu/triedreBase.py
--- 2/src/Tools/blocFissure/gmu/triedreBase.py
+++ b/src/Tools/blocFissure/gmu/triedreBase.py
@@@ -26,10 -23,11 +26,11 @@@ def triedreBase()
      OX = geompy.MakeVectorDXDYDZ(1, 0, 0)
      OY = geompy.MakeVectorDXDYDZ(0, 1, 0)
      OZ = geompy.MakeVectorDXDYDZ(0, 0, 1)
 -
 +  
-     geomPublish(initLog.debug,  O, 'O' )
-     geomPublish(initLog.debug,  OX, 'OX' )
-     geomPublish(initLog.debug,  OY, 'OY' )
-     geomPublish(initLog.debug,  OZ, 'OZ' )
+     if not geompy.myStudy.FindObjectByName( 'OX', geompy.ComponentDataType() ):
 -      geompy.addToStudy( O, 'O' )
 -      geompy.addToStudy( OX, 'OX' )
 -      geompy.addToStudy( OY, 'OY' )
 -      geompy.addToStudy( OZ, 'OZ' )
++      geomPublish(initLog.debug,  O, 'O' )
++      geomPublish(initLog.debug,  OX, 'OX' )
++      geomPublish(initLog.debug,  OY, 'OY' )
++      geomPublish(initLog.debug,  OZ, 'OZ' )
  
    return O, OX, OY, OZ

diff --cc src/Tools/blocFissure/ihm/fissureCoude_plugin.py
Simple merge

diff --cc src/Tools/blocFissure/materielCasTests/CMakeLists.txt
Simple merge