Merge remote-tracking branch 'refs/remotes/origin/dev'

Conflicts:
	ResInsightVersion.cmake

ApplicationCode/ProjectDataModel/RimEclipseView.cpp

@@ -367,6 +367,10 @@ void RimEclipseView::createDisplayModel()
             }
         }
 
+        // NOTE: This assignment must be done here, as m_visibleGridParts is used in code triggered by 
+        // m_reservoirGridPartManager->appendStaticGeometryPartsToModel()
+        m_visibleGridParts = geometryTypesToAdd;
+
         size_t frameIdx;
         for (frameIdx = 0; frameIdx < frameModels.size(); ++frameIdx)
         {
@@ -378,8 +382,6 @@ void RimEclipseView::createDisplayModel()
 
         // Set static colors 
         this->updateStaticCellColors();
-
-        m_visibleGridParts = geometryTypesToAdd;
     }
 
     m_reservoirGridPartManager->clearWatertightGeometryFlags();