Merge from V6_main 06/03/2013

This commit is contained in:
vsr 2013-03-07 11:07:32 +00:00
parent 1dac6744a7
commit 9be9f89876

View File

@ -1583,10 +1583,12 @@ Handle(GEOM_Object) GEOMImpl_IGroupOperations::GetMainShape (Handle(GEOM_Object)
SetErrorCode(KO); SetErrorCode(KO);
if (theGroup.IsNull()) return NULL; if (theGroup.IsNull()) return NULL;
if ( theGroup->GetType() != GEOM_GROUP ) { if (theGroup->GetType() != GEOM_GROUP &&
SetErrorCode( "Error: You could perform this operation only with group. Please select a group." ); theGroup->GetType() != GEOM_SUBSHAPE) {
SetErrorCode("Error: You could perform this operation only with a group or a sub-shape.");
return NULL; return NULL;
} }
Handle(GEOM_Function) aGroupFunction = theGroup->GetFunction(1); Handle(GEOM_Function) aGroupFunction = theGroup->GetFunction(1);
if (aGroupFunction.IsNull()) return NULL; if (aGroupFunction.IsNull()) return NULL;