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/RivNNCGeometryGenerator.cpp

@@ -96,7 +96,7 @@ void RivNNCGeometryGenerator::computeArrays()
 
         const RigConnection& conn = m_nncData->allConnections()[conIdx];
 
-        if ( conn.polygon().size() )
+        if ( !conn.polygon().empty() )
         {
             bool isVisible = true;
             if ( isVisibilityCalcActive )
@@ -176,7 +176,7 @@ void RivNNCGeometryGenerator::textureCoordinates( cvf::Vec2fArray*
         nncResultVals = m_nncData->generatedConnectionScalarResult( resVarAddr, nativeTimeStepIndex );
     }
 
-    if ( !nncResultVals || nncResultVals->size() == 0 )
+    if ( !nncResultVals || nncResultVals->empty() )
     {
         textureCoords->setAll( cvf::Vec2f( 0.0f, 1.0f ) );
         return;