Merge remote-tracking branch 'origin/patch_2021.10.3' into dev

This commit is contained in:
Magne Sjaastad
2022-03-28 09:06:38 +02:00
17 changed files with 164 additions and 31 deletions

View File

@@ -89,7 +89,7 @@ void RifSurfaceImporter::readGocadFile( const QString& filename, RigGocadData* g
auto tokens = RiaStdStringTools::splitString( line, ' ' );
std::string firstToken;
if ( !tokens.empty() ) firstToken = tokens.front();
if ( !tokens.empty() ) firstToken = RiaStdStringTools::trimString( tokens.front() );
if ( isInTfaceSection )
{