OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	ApplicationCode/Commands/RicDeleteItemFeature.cpp
This commit is contained in:
Magne Sjaastad
2017-02-08 07:35:20 +01:00
parent a79e6118c7 c8f682b205
commit 93954fece0
505 changed files with 13421 additions and 5935 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationCode/Commands/RicDeleteItemFeature.cpp
View File

@@ -60,6 +60,8 @@ namespace caf
bool isDeletable(PdmUiItem * uiItem)
{
if (dynamic_cast<RimWellFlowRateCurve*>(uiItem)) return false;
if (dynamic_cast<RimGeoMechView*>(uiItem)) return true;
if (dynamic_cast<RimEclipseView*>(uiItem)) return true;
if (dynamic_cast<RimIdenticalGridCaseGroup*>(uiItem)) return true;