Merge branch 'Dev_0.7.1' of newgeom:newgeom.git into Dev_0.7.1

diff --git a/src/ModuleBase/ModuleBase_Operation.cpp b/src/ModuleBase/ModuleBase_Operation.cpp
index 96060b463837050075cb47244ca5f19fe8fabb13..de9a9e857adb4ab11e69a832dd9a2c57299b13df 100644 (file)
--- a/src/ModuleBase/ModuleBase_Operation.cpp
+++ b/src/ModuleBase/ModuleBase_Operation.cpp
@@ -66,6 +66,8 @@ bool ModuleBase_Operation::isValid() const
 {
   if (!myFeature)
     return true; // rename operation
+  if (myFeature->isAction())
+    return true;
   //Get validators for the Id
   SessionPtr aMgr = ModelAPI_Session::get();
   ModelAPI_ValidatorsFactory* aFactory = aMgr->validators();

diff --git a/src/XGUI/XGUI_PropertyPanel.cpp b/src/XGUI/XGUI_PropertyPanel.cpp
index d5d213691af95176d94067e20b4d9bc414c87c57..22c56c2a3130383456f29e7b033679c51b304f3d 100644 (file)
--- a/src/XGUI/XGUI_PropertyPanel.cpp
+++ b/src/XGUI/XGUI_PropertyPanel.cpp
@@ -142,7 +142,7 @@ void XGUI_PropertyPanel::updateContentWidget(FeaturePtr theFeature)
   // Invalid feature case on abort of the operation
   if (theFeature.get() == NULL)
     return;
-  if(!theFeature->data())
+  if (theFeature->isAction() || !theFeature->data())
     return;
   foreach(ModuleBase_ModelWidget* eachWidget, myWidgets)
   {