Merge remote-tracking branch 'refs/remotes/origin/dev'

Conflicts:
	ApplicationCode/Commands/RicDeleteItemFeature.cpp
This commit is contained in:
Magne Sjaastad
2017-02-08 07:35:20 +01:00
505 changed files with 13421 additions and 5935 deletions

View File

@@ -1170,7 +1170,7 @@ void RimEclipseView::calculateVisibleWellCellsIncFence(cvf::UByteArray* visibleC
for (size_t wIdx = 0; wIdx < this->wellCollection()->wells().size(); ++wIdx)
{
RimEclipseWell* well = this->wellCollection()->wells()[wIdx];
if (well->showWell() && well->showWellCells())
if (well->isWellCellsVisible())
{
RigSingleWellResultsData* wres = well->wellResults();
if (!wres) continue;