Merge dev into pre-proto.

This commit is contained in:
Jacob Støren
2017-06-02 08:05:07 +02:00
28 changed files with 407 additions and 111 deletions

View File

@@ -251,8 +251,15 @@ void RimWellPath::fieldChangedByUi(const caf::PdmFieldHandle* changedField, cons
partMgr()->scheduleGeometryRegen();
RimProject* proj;
this->firstAncestorOrThisOfType(proj);
if (proj) proj->createDisplayModelAndRedrawAllViews();
this->firstAncestorOrThisOfTypeAsserted(proj);
if (changedField == &showWellPath)
{
proj->removeResult(RimDefines::DYNAMIC_NATIVE, RimDefines::completionTypeResultName());
}
else
{
proj->createDisplayModelAndRedrawAllViews();
}
}
//--------------------------------------------------------------------------------------------------