From 32fb09ca3c5b836f7fb1752868ee4edd7beee0f1 Mon Sep 17 00:00:00 2001
From: Gaute Lindkvist <lindkvis@gmail.com>
Date: Wed, 31 Oct 2018 13:04:47 +0100
Subject: [PATCH] #3590 Fix changing ov property filter of linked maps. Stop
 being able to modify a slave.

---
 ApplicationCode/ProjectDataModel/Rim2dEclipseView.cpp | 2 +-
 ApplicationCode/ProjectDataModel/RimEclipseView.cpp   | 8 ++++++++
 ApplicationCode/ProjectDataModel/RimEclipseView.h     | 1 +
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/ApplicationCode/ProjectDataModel/Rim2dEclipseView.cpp b/ApplicationCode/ProjectDataModel/Rim2dEclipseView.cpp
index 6c5df6f543..6610c73e5c 100644
--- a/ApplicationCode/ProjectDataModel/Rim2dEclipseView.cpp
+++ b/ApplicationCode/ProjectDataModel/Rim2dEclipseView.cpp
@@ -119,7 +119,7 @@ void Rim2dEclipseView::defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrderi
     uiTreeOrdering.add(wellCollection());
     uiTreeOrdering.add(faultCollection());
     uiTreeOrdering.add(m_rangeFilterCollection());
-    uiTreeOrdering.add(eclipsePropertyFilterCollection());
+    uiTreeOrdering.add(nonOverridePropertyFilterCollection());
 
     uiTreeOrdering.skipRemainingChildren();
 }
diff --git a/ApplicationCode/ProjectDataModel/RimEclipseView.cpp b/ApplicationCode/ProjectDataModel/RimEclipseView.cpp
index 791117b397..674ee76602 100644
--- a/ApplicationCode/ProjectDataModel/RimEclipseView.cpp
+++ b/ApplicationCode/ProjectDataModel/RimEclipseView.cpp
@@ -1853,3 +1853,11 @@ const RimPropertyFilterCollection* RimEclipseView::propertyFilterCollection() co
 {
     return eclipsePropertyFilterCollection();
 }
+
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+RimPropertyFilterCollection* RimEclipseView::nonOverridePropertyFilterCollection()
+{
+    return m_propertyFilterCollection();
+}
diff --git a/ApplicationCode/ProjectDataModel/RimEclipseView.h b/ApplicationCode/ProjectDataModel/RimEclipseView.h
index 4443d8e783..5b0d13b3b6 100644
--- a/ApplicationCode/ProjectDataModel/RimEclipseView.h
+++ b/ApplicationCode/ProjectDataModel/RimEclipseView.h
@@ -92,6 +92,7 @@ public:
 
     // Access internal objects
     const RimPropertyFilterCollection*              propertyFilterCollection() const override;
+    RimPropertyFilterCollection*                    nonOverridePropertyFilterCollection();
 
     RimEclipsePropertyFilterCollection*             eclipsePropertyFilterCollection();
     const RimEclipsePropertyFilterCollection*       eclipsePropertyFilterCollection() const;