From e603c0913257c1856bcb07dfcefdd8e918142300 Mon Sep 17 00:00:00 2001
From: nds <natalia.donis@opencascade.com>
Date: Fri, 25 Apr 2014 18:02:31 +0400
Subject: [PATCH] Merge branch 'master' of newgeom:newgeom

Conflicts:
	src/PartSet/PartSet_Module.cpp
	src/XGUI/CMakeLists.txt
---
 src/PartSet/PartSet_Module.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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)
-- 
2.39.2