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 remote branch 'origin/V8_5_asterstudy'
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_MergeDlg.cxx
diff --git
a/src/SMESHGUI/SMESHGUI_MergeDlg.cxx
b/src/SMESHGUI/SMESHGUI_MergeDlg.cxx
index d81c2284900d0fdc5f81f56ca51e32e5792f6c93..6bba06313aced59eb31f9ac401b664c94b0062f1 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_MergeDlg.cxx
+++ b/
src/SMESHGUI/SMESHGUI_MergeDlg.cxx
@@
-511,7
+511,7
@@
void SMESHGUI_MergeDlg::FindGravityCenter(TColStd_MapOfInteger & theElemsIdMap,
//=================================================================================
bool SMESHGUI_MergeDlg::ClickOnApply()
{
//=================================================================================
bool SMESHGUI_MergeDlg::ClickOnApply()
{
- if (
mySMESHGUI->isActive
StudyLocked() || myMesh->_is_nil())
+ if (
SMESHGUI::is
StudyLocked() || myMesh->_is_nil())
return false;
try {
return false;
try {