mirror of
https://git.salome-platform.org/gitpub/modules/smesh.git
synced 2024-12-28 18:30:35 +05:00
Corrected for bug NPAL14695
This commit is contained in:
parent
70573e6940
commit
1a1cdf7bcc
@ -331,11 +331,19 @@ bool SMESHGUI_MeshOp::isSubshapeOk() const
|
|||||||
GEOM::GEOM_Object::_narrow(_CAST(SObject,pSubGeom)->GetObject());
|
GEOM::GEOM_Object::_narrow(_CAST(SObject,pSubGeom)->GetObject());
|
||||||
if (aSubGeomVar->_is_nil()) return false;
|
if (aSubGeomVar->_is_nil()) return false;
|
||||||
|
|
||||||
|
// skl for NPAL14695 - implementation of searching of mainObj
|
||||||
GEOM::GEOM_Object_var mainObj = op->GetMainShape(aSubGeomVar);
|
GEOM::GEOM_Object_var mainObj = op->GetMainShape(aSubGeomVar);
|
||||||
if (mainObj->_is_nil() ||
|
//if (mainObj->_is_nil() ||
|
||||||
string(mainObj->GetEntry()) != string(mainGeom->GetEntry())) return false;
|
// string(mainObj->GetEntry()) != string(mainGeom->GetEntry())) return false;
|
||||||
|
while(1) {
|
||||||
|
if(mainObj->_is_nil())
|
||||||
|
return false;
|
||||||
|
if( string(mainObj->GetEntry()) == string(mainGeom->GetEntry()) )
|
||||||
|
return true;
|
||||||
|
mainObj = op->GetMainShape(mainObj);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
return true;
|
//return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
|
Loading…
Reference in New Issue
Block a user