From: Paul RASCLE <paul.rascle@edf.fr>
Date: Thu, 7 Jan 2016 17:15:04 +0000 (+0100)
Subject: merge master
X-Git-Tag: V7_8_0a1~8
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=7a65c9fad427b1ccba6b9ccae612296e5092a324;p=modules%2Fsmesh.git

merge master
---

7a65c9fad427b1ccba6b9ccae612296e5092a324
diff --cc src/Tools/blocFissure/gmu/triedreBase.py
index 068ca40b7,ffc3a1b32..8113cd077
--- a/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