From: nds <natalia.donis@opencascade.com>
Date: Fri, 25 Apr 2014 14:02:31 +0000 (+0400)
Subject: Merge branch 'master' of newgeom:newgeom
X-Git-Tag: V_0.2~116^2~1
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=e603c0913257c1856bcb07dfcefdd8e918142300;p=modules%2Fshaper.git

Merge branch 'master' of newgeom:newgeom

Conflicts:
	src/PartSet/PartSet_Module.cpp
	src/XGUI/CMakeLists.txt
---

diff --git a/src/PartSet/PartSet_Module.cpp b/src/PartSet/PartSet_Module.cpp
index ebe70c482..5893526b4 100644
--- a/src/PartSet/PartSet_Module.cpp
+++ b/src/PartSet/PartSet_Module.cpp
@@ -87,7 +87,7 @@ void PartSet_Module::launchOperation(const QString& theCmdId)
   if (theCmdId == "Sketch" ) {
     aPartSetOp = new PartSet_OperationSketch(theCmdId, this);
   }
-  else if(aCmdId == "SketchLine") {
+  else if(theCmdId == "SketchLine") {
     ModuleBase_Operation* anOperation = myWorkshop->operationMgr()->currentOperation();
     boost::shared_ptr<ModelAPI_Feature> aSketchFeature;
     if (anOperation)