From: vpa <vpa@opencascade.com>
Date: Thu, 21 May 2015 15:19:38 +0000 (+0300)
Subject: Correcting erroneous results of merge
X-Git-Tag: V7_0_0_beta~541
X-Git-Url: http://git.dev.opencascade.org/gitweb/?a=commitdiff_plain;h=fb64064b00f75443fe50ead1a3e0abd9a1fbdf6a;p=occt-copy.git

Correcting erroneous results of merge
---

diff --git a/src/ViewerTest/ViewerTest_ViewerCommands.cxx b/src/ViewerTest/ViewerTest_ViewerCommands.cxx
index 732093e245..8275d2a58b 100644
--- a/src/ViewerTest/ViewerTest_ViewerCommands.cxx
+++ b/src/ViewerTest/ViewerTest_ViewerCommands.cxx
@@ -2480,8 +2480,6 @@ static int VFit (Draw_Interpretor& /*theDi*/, Standard_Integer theArgc, const ch
   }
 
   const Handle(V3d_View) aView = ViewerTest::CurrentView();
-<<<<<<< .mine
-  Handle(NIS_View) V = Handle(NIS_View)::DownCast (aView);
 
   if (theArgc == 2)
   {
@@ -2489,32 +2487,12 @@ static int VFit (Draw_Interpretor& /*theDi*/, Standard_Integer theArgc, const ch
     anArg.LowerCase();
     if (anArg == "-selected")
     {
-      ViewerTest::GetAISContext()->FitSelected (V.IsNull() ? aView : V);
+      ViewerTest::GetAISContext()->FitSelected (aView);
       return 0;
     }
   }
+  if (aView.IsNull() == Standard_False) {
 
-  if (V.IsNull() == Standard_False) {
-    V->FitAll3d();
-  } else if (aView.IsNull() == Standard_False) {
-=======
-  if (!aView.IsNull())
-  {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
->>>>>>> .theirs
     aView->FitAll();
   }
   return 0;