From: Sergey BELASH <belash.sergey@opencascade.com>
Date: Thu, 17 Jul 2014 09:17:57 +0000 (+0400)
Subject: Merge branch 'master' of newgeom:newgeom.git
X-Git-Tag: V_0.4.4~176
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=5d3cd989dcae90a9981d0d874e6fd75676db03d8;p=modules%2Fshaper.git

Merge branch 'master' of newgeom:newgeom.git
---

5d3cd989dcae90a9981d0d874e6fd75676db03d8
diff --cc src/XGUI/XGUI_Workshop.cpp
index 47176fbd4,b04756212..9b0a8f086
--- a/src/XGUI/XGUI_Workshop.cpp
+++ b/src/XGUI/XGUI_Workshop.cpp
@@@ -323,9 -317,9 +317,9 @@@ void XGUI_Workshop::onFeatureRedisplayM
  }
  
  //******************************************************
 -void XGUI_Workshop::onFeatureCreatedMsg(const Model_ObjectUpdatedMessage* theMsg)
 +void XGUI_Workshop::onFeatureCreatedMsg(const ModelAPI_ObjectUpdatedMessage* theMsg)
  {
-   std::set<ObjectPtr> aFeatures = theMsg->objects();
+   std::set<ObjectPtr> aObjects = theMsg->objects();
  
    std::set<ObjectPtr>::const_iterator aIt;
    bool aHasPart = false;