Merge branch 'dev' into pre-proto

This commit is contained in:
Magne Sjaastad
2017-04-03 07:34:56 +02:00
181 changed files with 6568 additions and 2318 deletions

View File

@@ -411,7 +411,7 @@ void RimWellPath::defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering, Q
{
uiTreeOrdering.add(fracture);
}
uiTreeOrdering.setForgetRemainingFields(true);
uiTreeOrdering.skipRemainingChildren(true);
}
//--------------------------------------------------------------------------------------------------