Merged in changes from maintenance branch

This commit is contained in:
Magne Sjaastad
2016-08-11 10:29:14 +02:00
11 changed files with 259 additions and 51 deletions

View File

@@ -20,6 +20,7 @@
#include "RimEclipseCellColors.h"
#include "RimCellEdgeColors.h"
#include "RimEclipseFaultColors.h"
#include "RimEclipseView.h"
#include "RimLegendConfig.h"
@@ -91,6 +92,12 @@ void RimEclipseCellColors::fieldChangedByUi(const caf::PdmFieldHandle* changedFi
{
faultColors->updateConnectedEditors();
}
RimCellEdgeColors* cellEdgeColors = dynamic_cast<RimCellEdgeColors*>(this->parentField()->ownerObject());
if (cellEdgeColors)
{
cellEdgeColors->updateConnectedEditors();
}
}
if (m_reservoirView) m_reservoirView->createDisplayModelAndRedraw();