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
PR: synchro V6_main tag mergeto_V7_main_11Feb13
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_BuildCompoundDlg.cxx
diff --git
a/src/SMESHGUI/SMESHGUI_BuildCompoundDlg.cxx
b/src/SMESHGUI/SMESHGUI_BuildCompoundDlg.cxx
index 0d97f601d9238bc90e773e66eed5f5e3ef2a3394..cadd4593f51688b49182c8cc8966723736e8986d 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_BuildCompoundDlg.cxx
+++ b/
src/SMESHGUI/SMESHGUI_BuildCompoundDlg.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
1
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
2
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
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@
-206,7
+206,7
@@
void SMESHGUI_BuildCompoundDlg::Init()
myMesh = SMESH::SMESH_Mesh::_nil();
myMesh = SMESH::SMESH_Mesh::_nil();
- myMeshFilter = new SMESH_TypeFilter (MESH);
+ myMeshFilter = new SMESH_TypeFilter (
SMESH::
MESH);
myMeshArray = new SMESH::mesh_array();
myMeshArray = new SMESH::mesh_array();
@@
-347,13
+347,11
@@
bool SMESHGUI_BuildCompoundDlg::ClickOnApply()
SMESHGUI::Modified();
SMESHGUI::Modified();
-#ifdef WITHGENERICOBJ
// obj has been published in study. Its refcount has been incremented.
// It is safe to decrement its refcount
// so that it will be destroyed when the entry in study will be removed
if (!CORBA::is_nil(aCompoundMesh))
aCompoundMesh->UnRegister();
// obj has been published in study. Its refcount has been incremented.
// It is safe to decrement its refcount
// so that it will be destroyed when the entry in study will be removed
if (!CORBA::is_nil(aCompoundMesh))
aCompoundMesh->UnRegister();
-#endif
return true;
}
return true;
}