OilfieldToolsNet/ResInsight
4
0 Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-11-01 16:43:03 -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 committed 2023-10-23 09:26:33 +02:00
1 parent 5688838899
commit 06f9c6126d
1778 files changed
+35036 -12457
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

ApplicationLibCode/UserInterface/RiuPickItemInfo.cpp
+2 -2
View File
@@ -112,9 +112,9 @@ bool RiuPickItemInfo::operator<( const RiuPickItemInfo& other ) const
{
return m_distanceAlongRay < other.distanceAlongRay();
}
else if ( this->polygonOffsetUnit() != other.polygonOffsetUnit() )
else if ( polygonOffsetUnit() != other.polygonOffsetUnit() )
{
return this->polygonOffsetUnit() < other.polygonOffsetUnit();
return polygonOffsetUnit() < other.polygonOffsetUnit();
}
else if ( m_faceIdx != other.faceIdx() )
{