OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Copy changes from dev-branch into main

Browse Source 
History of main branch was difficult to merge. Take a copy of dev-branch, and merge both ways between dev and main after the release.
This commit is contained in:
Magne Sjaastad
2023-10-23 08:12:19 +02:00
parent 5688838899
commit 06f9c6126d
1778 changed files with 35036 additions and 12457 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ApplicationLibCode/Commands/RicHideIntersectionFeature.cpp
View File

@@ -32,7 +32,7 @@ CAF_CMD_SOURCE_INIT( RicHideIntersectionFeature, "RicHideIntersectionFeature" );
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RicHideIntersectionFeature::isCommandEnabled()
bool RicHideIntersectionFeature::isCommandEnabled() const
{
Rim3dView* activeView = RiaApplication::instance()->activeReservoirView();
if ( !activeView ) return false;
@@ -44,11 +44,7 @@ bool RicHideIntersectionFeature::isCommandEnabled()
if ( !generalSelectionItem ) return false;
RimExtrudedCurveIntersection* intersection = dynamic_cast<RimExtrudedCurveIntersection*>( generalSelectionItem->m_object );
if ( intersection )
{
return true;
}
return false;
return intersection != nullptr;
}
//--------------------------------------------------------------------------------------------------