Copy changes from dev-branch into main

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.

ApplicationLibCode/ProjectDataModel/RimSurfaceIntersectionCurve.cpp

@@ -20,10 +20,9 @@
 
 #include "RimAnnotationLineAppearance.h"
 #include "RimEnsembleSurface.h"
-#include "RimOilField.h"
-#include "RimProject.h"
 #include "RimSurface.h"
 #include "RimSurfaceCollection.h"
+#include "RimTools.h"
 
 #include "cafPdmUiTreeSelectionEditor.h"
 
@@ -93,7 +92,7 @@ QList<caf::PdmOptionItemInfo> RimSurfaceIntersectionCurve::calculateValueOptions
 
     if ( fieldNeedingOptions == &m_surface1 )
     {
-        RimSurfaceCollection* surfColl = RimProject::current()->activeOilField()->surfaceCollection();
+        RimSurfaceCollection* surfColl = RimTools::surfaceCollection();
 
         appendOptionItemsForSources( 0, surfColl, true, options );
     }