#1724 Fix merge issues

This commit is contained in:
Magne Sjaastad
2017-08-04 10:45:04 +02:00
parent c481a275ee
commit 3c5016cb8c
2 changed files with 2 additions and 2 deletions

View File

@@ -445,7 +445,7 @@ void RivWellPathPartMgr::clearAllBranchData()
//--------------------------------------------------------------------------------------------------
size_t RivWellPathPartMgr::segmentIndexFromTriangleIndex(size_t triangleIndex)
{
return m_pipeBranchData.m_pipeGeomGenerator->pipeSegmentIndexFromTriangleIndex(triangleIndex);
return m_pipeBranchData.m_pipeGeomGenerator->segmentIndexFromTriangleIndex(triangleIndex);
}
//--------------------------------------------------------------------------------------------------