From a48d05e2bf00c8f7e03661a5e7770a25bd46035b Mon Sep 17 00:00:00 2001 From: Alexander Golubev Date: Sun, 17 May 2015 18:25:45 +0300 Subject: [PATCH] salomesmesh: fix an error because of bad priorities in logial operators --- src/3rdParty/salomesmesh/src/Controls/SMESH_Controls.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/3rdParty/salomesmesh/src/Controls/SMESH_Controls.cpp b/src/3rdParty/salomesmesh/src/Controls/SMESH_Controls.cpp index 0362bed52..43387020e 100644 --- a/src/3rdParty/salomesmesh/src/Controls/SMESH_Controls.cpp +++ b/src/3rdParty/salomesmesh/src/Controls/SMESH_Controls.cpp @@ -2399,9 +2399,10 @@ bool LogicalOR::IsSatisfy( long theId ) { return (myPredicate1!=NULL) && - (myPredicate2!=NULL) && - myPredicate1->IsSatisfy( theId ) || - myPredicate2->IsSatisfy( theId ); + (myPredicate2!=NULL) && ( + myPredicate1->IsSatisfy( theId ) || + myPredicate2->IsSatisfy( theId ) + ); }