2025.04.0 Merge dev into main

This commit is contained in:
Magne Sjaastad committed 2025-04-07 12:21:57 +02:00
1 parent e9ec8cb718
commit f96374a6b4
969 files changed
+40872 -31569

No files matched your search

@@ -558,8 +558,7 @@ RimWellPath* RimTools::firstWellPath()
//--------------------------------------------------------------------------------------------------
RimSurfaceCollection* RimTools::surfaceCollection()
{
RimProject* proj = RimProject::current();
return proj->activeOilField()->surfaceCollection();
return RimProject::current()->activeOilField()->surfaceCollection();
}
//--------------------------------------------------------------------------------------------------
@@ -567,8 +566,15 @@ RimSurfaceCollection* RimTools::surfaceCollection()
//--------------------------------------------------------------------------------------------------
RimPolygonCollection* RimTools::polygonCollection()
{
RimProject* proj = RimProject::current();
return proj->activeOilField()->polygonCollection();
return RimProject::current()->activeOilField()->polygonCollection();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimAutomationSettings* RimTools::automationSettings()
{
return RimProject::current()->automationSettings();
}
//--------------------------------------------------------------------------------------------------