Merge remote-tracking branch 'origin/2020.10-patch-01' into dev

This commit is contained in:
Magne Sjaastad committed 2020-11-12 09:06:28 +01:00
commit 1a3a155d36
27 files changed
+384 -124

No files matched your search

@@ -239,6 +239,14 @@ bool RimContourMapProjection::showContourLines() const
return m_showContourLines();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RimContourMapProjection::showContourLabels() const
{
return m_showContourLabels();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------