Merge branch 'master' of newgeom:newgeom.git

diff --combined src/ModuleBase/ModuleBase_WidgetFeature.cpp
index ec61e844359fb6e23b90305821edb52b0b755ce5,6586a491a104783222dc1d23b58a43ffa35636c6..e1f8752dc30f221e5780fe12fa259921317b5de2
--- 1/src/ModuleBase/ModuleBase_WidgetFeature.cpp
--- 2/src/ModuleBase/ModuleBase_WidgetFeature.cpp
+++ b/src/ModuleBase/ModuleBase_WidgetFeature.cpp
@@@ -71,7 -71,7 +71,7 @@@ bool ModuleBase_WidgetFeature::setValue
  
  bool ModuleBase_WidgetFeature::setObject(const ObjectPtr& theObject, bool theSendEvent)
  {
-   PluginManagerPtr aMgr = ModelAPI_PluginManager::get();
+   SessionPtr aMgr = ModelAPI_Session::get();
    ModelAPI_ValidatorsFactory* aFactory = aMgr->validators();
    std::list<ModelAPI_Validator*> aValidators;
    std::list<std::list<std::string> > anArguments;
@@@ -137,9 -137,10 +137,9 @@@ bool ModuleBase_WidgetFeature::restoreV
    boost::shared_ptr<ModelAPI_AttributeRefAttr> aRef = boost::dynamic_pointer_cast<
        ModelAPI_AttributeRefAttr>(aData->attribute(attributeID()));
  
 -  ObjectPtr aObj = aRef->object();
 -  FeaturePtr aFeature = boost::dynamic_pointer_cast<ModelAPI_Feature>(aRef->object());
 -  if (aFeature) {
 -    myObject = aFeature;
 +  ObjectPtr anObjPtr = aRef->object();
 +  if (anObjPtr) {
 +    myObject = anObjPtr;
      myEditor->setText(myObject ? myObject->data()->name().c_str() : "");
      return true;
    }