From a5b83dcd65dad42fdfe18df3dd9cad8f3007375d Mon Sep 17 00:00:00 2001
From: dbv <dbv@opencascade.com>
Date: Tue, 18 Oct 2016 09:57:18 +0300
Subject: [PATCH] Revert "Fix for crash when selected shape without surface"

This reverts commit 0f587dacc8f0519cb14a8e2a0e3f71b3b42a8df6.
---
 src/BRepAdaptor/BRepAdaptor_Surface.cxx | 23 +++++++++--------------
 src/Extrema/Extrema_GenExtPS.cxx        |  5 -----
 2 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/src/BRepAdaptor/BRepAdaptor_Surface.cxx b/src/BRepAdaptor/BRepAdaptor_Surface.cxx
index b0e8dc47f2..850facead9 100644
--- a/src/BRepAdaptor/BRepAdaptor_Surface.cxx
+++ b/src/BRepAdaptor/BRepAdaptor_Surface.cxx
@@ -72,19 +72,18 @@ void BRepAdaptor_Surface::Initialize(const TopoDS_Face& F,
 {
   myFace = F;
   TopLoc_Location L;
-  const Handle (Geom_Surface)& aSurface = BRep_Tool::Surface (F, L);
-  if (aSurface.IsNull ())
+  const Handle(Geom_Surface)& aSurface = BRep_Tool::Surface(F, L);
+  if (aSurface.IsNull())
     return;
 
-  if (Restriction)
-  {
-    Standard_Real umin, umax, vmin, vmax;
-    BRepTools::UVBounds (F, umin, umax, vmin, vmax);
-    mySurf.Load (aSurface, umin, umax, vmin, vmax);
+  if (Restriction) {
+    Standard_Real umin,umax,vmin,vmax;
+    BRepTools::UVBounds(F,umin,umax,vmin,vmax);
+    mySurf.Load(aSurface,umin,umax,vmin,vmax);
   }
-  else
-    mySurf.Load (aSurface);
-  myTrsf = L.Transformation ();
+  else 
+    mySurf.Load(aSurface);
+  myTrsf = L.Transformation();
 }
 
 
@@ -426,10 +425,6 @@ Handle(Adaptor3d_HCurve) BRepAdaptor_Surface::BasisCurve() const
 
 Handle(Adaptor3d_HSurface) BRepAdaptor_Surface::BasisSurface() const 
 {  
-  if(mySurf.Surface().IsNull())
-  {
-    return Handle(Adaptor3d_HSurface)();
-  }
   Handle(GeomAdaptor_HSurface) HS = new GeomAdaptor_HSurface();
   HS->ChangeSurface().Load
     (Handle(Geom_Surface)::DownCast(mySurf.Surface()->Transformed(myTrsf)));
diff --git a/src/Extrema/Extrema_GenExtPS.cxx b/src/Extrema/Extrema_GenExtPS.cxx
index 24279056f3..6c949bc0cd 100644
--- a/src/Extrema/Extrema_GenExtPS.cxx
+++ b/src/Extrema/Extrema_GenExtPS.cxx
@@ -803,11 +803,6 @@ void Extrema_GenExtPS::Perform(const gp_Pnt& P)
   myDone = Standard_False;
   myF.SetPoint(P);
   
-  if (myS->BasisSurface ().IsNull ())
-  {
-    return;
-  }
-
   if(myAlgo == Extrema_ExtAlgo_Grad)
   {
     BuildGrid(P);