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/ModelVisualization/RivFishbonesSubsPartMgr.cpp

@@ -60,7 +60,7 @@ void RivFishbonesSubsPartMgr::appendGeometryPartsToModel( cvf::ModelBasicList*
 
     if ( !m_rimFishbonesSubs->isActive() ) return;
 
-    if ( m_parts.size() == 0 )
+    if ( m_parts.empty() )
     {
         buildParts( displayCoordTransform, characteristicCellSize );
     }