Corrections for bug IPAL12999.

diff --git a/src/GEOM/GEOM_Object.cxx b/src/GEOM/GEOM_Object.cxx
index e36ddc9095ecb5c3ccbaf5c2f9e49a1673b8d3d2..ecb9f84a39aa896c6825e2c23b81a27f831fa99d 100644 (file)
--- a/src/GEOM/GEOM_Object.cxx
+++ b/src/GEOM/GEOM_Object.cxx
@@ -272,7 +272,10 @@ bool GEOM_Object::IsMainShape()
 Handle(GEOM_Function) GEOM_Object::AddFunction(const Standard_GUID& theGUID, int theFunctionType)
 {
   Standard_Integer nb = GetNbFunctions();
-  if(nb == 1 && theGUID == GetSubShapeID()) return NULL; //It's impossible to add a function to sub shape
+
+  //if(nb == 1 && theGUID == GetSubShapeID()) return NULL; //It's impossible to add a function to sub shape
+  // change by skl (+srn) for IPAL12999
+  if(nb == 1 && GetFunction(1)->GetDriverGUID() == GetSubShapeID()) return NULL; //It's impossible to add a function to sub shape
   nb++;
   TDF_Label aChild = FUNCTION_LABEL(nb);
 

diff --git a/src/GEOMImpl/GEOMImpl_IHealingOperations.cxx b/src/GEOMImpl/GEOMImpl_IHealingOperations.cxx
index 00abf47d72ff006541829edd5bebc60e8806c5ce..201a71a31369c40c2c8240e44506727d0fd75750 100644 (file)
--- a/src/GEOMImpl/GEOMImpl_IHealingOperations.cxx
+++ b/src/GEOMImpl/GEOMImpl_IHealingOperations.cxx
@@ -788,6 +788,11 @@ Handle(GEOM_Object) GEOMImpl_IHealingOperations::ChangeOrientation (Handle(GEOM_
   if (theObject.IsNull())
     return NULL;
 
+  if (!theObject->IsMainShape()) {
+    SetErrorCode("Sub shape cannot be transformed - need to create a copy");
+    return NULL;
+  }
+
   Handle(GEOM_Function) aFunction, aLastFunction = theObject->GetLastFunction();
   if (aLastFunction.IsNull()) 
     return NULL; //There is no function which creates an object to be processed