OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-08-04 13:13:25 +03:00
Code

Correcting erroneous results of merge

Browse Source
This commit is contained in:
vpa 2015-05-21 18:19:38 +03:00 committed by bugmaster
parent 37d6975c77
commit fb64064b00
1 changed files with 2 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/ViewerTest/ViewerTest_ViewerCommands.cxx
View File

@ -2480,8 +2480,6 @@ static int VFit (Draw_Interpretor& /*theDi*/, Standard_Integer theArgc, const ch
} }
const Handle(V3d_View) aView = ViewerTest::CurrentView(); const Handle(V3d_View) aView = ViewerTest::CurrentView();
<<<<<<< .mine
Handle(NIS_View) V = Handle(NIS_View)::DownCast (aView);
if (theArgc == 2) if (theArgc == 2)
{ {
@ -2489,32 +2487,12 @@ static int VFit (Draw_Interpretor& /*theDi*/, Standard_Integer theArgc, const ch
anArg.LowerCase(); anArg.LowerCase();
if (anArg == "-selected") if (anArg == "-selected")
{ {
ViewerTest::GetAISContext()->FitSelected (V.IsNull() ? aView : V); ViewerTest::GetAISContext()->FitSelected (aView);
return 0; 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(); aView->FitAll();
} }
return 0; return 0;