Merge branch 'dev' into feature-analysis-plots-initial

This commit is contained in:
Magne Sjaastad committed 2020-03-06 08:06:48 +01:00
commit f131ad77e1
114 files changed
+2465 -1025

No files matched your search

@@ -456,7 +456,7 @@ void RivSurfacePartMgr::calculateVertexTextureCoordinates( cvf::Vec2fArray*
cvf::Vec2f* rawPtr = textureCoords->ptr();
#pragma omp parallel for
for ( int vxIdx = 0; vxIdx < numVertices; vxIdx++ )
for ( int vxIdx = 0; vxIdx < static_cast<int>( numVertices ); vxIdx++ )
{
double cellScalarValue = resultAccessor->cellScalarGlobIdx( vertexToCellIdxMap[vxIdx] );
cvf::Vec2f texCoord = mapper->mapToTextureCoord( cellScalarValue );