Salome HOME
projects
/
modules
/
smesh.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge from PortingMED3 07Apr11
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_CreatePatternDlg.cxx
diff --git
a/src/SMESHGUI/SMESHGUI_CreatePatternDlg.cxx
b/src/SMESHGUI/SMESHGUI_CreatePatternDlg.cxx
index d82031e1d99bd06eb39e37e604faab89d8255935..9afa1ef330a2503b0265d93c7444d720aca102d1 100755
(executable)
--- a/
src/SMESHGUI/SMESHGUI_CreatePatternDlg.cxx
+++ b/
src/SMESHGUI/SMESHGUI_CreatePatternDlg.cxx
@@
-533,7
+533,7
@@
bool SMESHGUI_CreatePatternDlg::loadFromObject( const bool theMess )
if ( myPattern->_is_nil() )
myPattern = SMESH::GetPattern();
if ( myPattern->_is_nil() )
myPattern = SMESH::GetPattern();
- if (
myMesh->_is_nil() && mySubMesh->_is_nil(
) || myGeomObj->_is_nil() )
+ if (
(myMesh->_is_nil() && mySubMesh->_is_nil()
) || myGeomObj->_is_nil() )
return false;
SMESH::SMESH_Mesh_ptr aMesh = mySubMesh->_is_nil() ? myMesh.in() : mySubMesh->GetFather();
return false;
SMESH::SMESH_Mesh_ptr aMesh = mySubMesh->_is_nil() ? myMesh.in() : mySubMesh->GetFather();