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

Conflicts:
	src/GeomAPI/GeomAPI_Shape.cpp
	src/GeomAPI/GeomAPI_Shape.h

diff --cc src/GeomAPI/GeomAPI_Shape.cpp
index f7f05846a114a12466e5333e16b7f02e4f839448,ded2008375e370727b818657712fae59ee2c7634..10bd21df9d82f6bc9d409b4204c819cbc2664af5
--- 1/src/GeomAPI/GeomAPI_Shape.cpp
--- 2/src/GeomAPI/GeomAPI_Shape.cpp
+++ b/src/GeomAPI/GeomAPI_Shape.cpp
@@@ -9,17 -9,10 +9,23 @@@
  #define MY_PNT static_cast<gp_Pnt*>(myImpl)
  
  GeomAPI_Shape::GeomAPI_Shape()
-   : GeomAPI_Interface(new TopoDS_Shape())
- {}
+     : GeomAPI_Interface(new TopoDS_Shape()) {
+ }
+ 
+ bool GeomAPI_Shape::isNull()
+ {
+   return MY_SHAPE->IsNull();
+ }
++
 +
 +bool GeomAPI_Shape::isVertex() const
 +{
 +  const TopoDS_Shape& aShape = const_cast<GeomAPI_Shape*>(this)->impl<TopoDS_Shape>();
 +  return aShape.TShape()->ShapeType() == TopAbs_VERTEX;
 +}
 +
 +bool GeomAPI_Shape::isEdge() const
 +{
 +  const TopoDS_Shape& aShape = const_cast<GeomAPI_Shape*>(this)->impl<TopoDS_Shape>();
 +  return aShape.TShape()->ShapeType() == TopAbs_EDGE;
 +}

diff --cc src/GeomAPI/GeomAPI_Shape.h
index 7394bee05c088fc8ef10b60185e4f85b9ac5b5ea,514287a03a22a08f89a1a7467b30c6fb4247c4e9..b557e845ed47cb50052b6d8d43923969ef0a90cc
--- 1/src/GeomAPI/GeomAPI_Shape.h
--- 2/src/GeomAPI/GeomAPI_Shape.h
+++ b/src/GeomAPI/GeomAPI_Shape.h
@@@ -18,11 -21,8 +21,13 @@@ public
    /// Creation of empty (null) shape
    GeomAPI_Shape();
  
+   bool isNull();
+ 
 +  /// Returns whether the shape is a vertex
 +  virtual bool isVertex() const;
 +
 +  /// Returns whether the shape is an edge
 +  virtual bool isEdge() const;
  };
  
  #endif