suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Sketcher] corrected artifact introduced by faulty conflict resolution

Browse Source
This commit is contained in:
AjinkyaDahale 2017-02-05 21:48:04 +05:30 committed by wmayer
parent 3cf00a1314
commit 3d9b46d9f3
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Mod/Sketcher/Gui/CommandConstraints.cpp
View File

@ -845,11 +845,7 @@ class DrawSketchHandlerGenConstraint: public DrawSketchHandler
{
public:
DrawSketchHandlerGenConstraint(const char* cursor[], CmdSketcherConstraint *_cmd)
<<<<<<< 60ae927fcbae5a873045551206a68d6b12c36d02
: selFilterGate(nullptr), constraintCursor(cursor), cmd(_cmd) {}
=======
: constraintCursor(cursor), cmd(_cmd) {}
>>>>>>> Replace some of the allowedSelSequences with more general form
virtual ~DrawSketchHandlerGenConstraint()
{
Gui::Selection().rmvSelectionGate();