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 ebe70c482758d4f38599aef5f1ff5aa8877f18c5..5893526b45f6d98919cd8379baa1eccb05873c31 100644 (file)
--- 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)