From: azv <azv@opencascade.com>
Date: Fri, 24 Mar 2017 12:30:24 +0000 (+0300)
Subject: Merge remote-tracking branch 'remotes/origin/master' into issue_2024
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=09f92d3917cf4c18d4ca96cbb1d37a9ede97889f;p=modules%2Fshaper.git

Merge remote-tracking branch 'remotes/origin/master' into issue_2024
---

09f92d3917cf4c18d4ca96cbb1d37a9ede97889f
diff --cc src/SketchPlugin/SketchPlugin_Validators.cpp
index f224f99eb,cb4b746b6..ce6ee3b34
--- a/src/SketchPlugin/SketchPlugin_Validators.cpp
+++ b/src/SketchPlugin/SketchPlugin_Validators.cpp
@@@ -10,13 -10,13 +10,14 @@@
  #include "SketchPlugin_Circle.h"
  #include "SketchPlugin_ConstraintCoincidence.h"
  #include "SketchPlugin_ConstraintDistance.h"
 -#include "SketchPlugin_Fillet.h"
  #include "SketchPlugin_ConstraintRigid.h"
  #include "SketchPlugin_ConstraintTangent.h"
 +#include "SketchPlugin_Fillet.h"
  #include "SketchPlugin_Line.h"
 +#include "SketchPlugin_MacroCircle.h"
  #include "SketchPlugin_Point.h"
  #include "SketchPlugin_Sketch.h"
+ #include "SketchPlugin_Trim.h"
  #include "SketchPlugin_Tools.h"
  
  #include "SketcherPrs_Tools.h"
@@@ -37,9 -37,9 +38,10 @@@
  #include <ModelAPI_ResultConstruction.h>
  
  #include <ModelGeomAlgo_Point2D.h>
+ #include <ModelGeomAlgo_Shape.h>
  
  #include <GeomAPI_Circ.h>
 +#include <GeomAPI_Dir2d.h>
  #include <GeomAPI_Lin.h>
  #include <GeomAPI_Edge.h>
  #include <GeomAPI_Vertex.h>