Merge branch 'annotation-items' into dev

2025-02-25 18:55:39 -06:00 · 2019-03-19 15:00:30 +01:00
parent 28e6bf8d2d 221afb38d3
commit 59c83157d1
45 changed files with 2104 additions and 117 deletions
--- a/ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.h
+++ b/ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.h
@@ -76,6 +76,7 @@ public:
    void                            simpleCopy(const RimEclipseResultDefinition* other);

    void                            setEclipseCase(RimEclipseCase* eclipseCase);
+    RimEclipseCase*                 eclipseCase();

    RiaDefines::ResultCatType       resultType() const { return m_resultType(); }
    void                            setResultType(RiaDefines::ResultCatType val);