From 8d0926dd53f215b3c12872edf3f1e1c685002e81 Mon Sep 17 00:00:00 2001 From: Magne Sjaastad Date: Mon, 3 Dec 2018 13:55:48 +0100 Subject: [PATCH] Fix Linux build issue --- .../ModelVisualization/RivTextAnnotationPartMgr.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ApplicationCode/ModelVisualization/RivTextAnnotationPartMgr.cpp b/ApplicationCode/ModelVisualization/RivTextAnnotationPartMgr.cpp index 90e0ec6564..6d69f552b6 100644 --- a/ApplicationCode/ModelVisualization/RivTextAnnotationPartMgr.cpp +++ b/ApplicationCode/ModelVisualization/RivTextAnnotationPartMgr.cpp @@ -240,7 +240,9 @@ RimAnnotationInViewCollection* RivTextAnnotationPartMgr::annotationCollection() //-------------------------------------------------------------------------------------------------- RimTextAnnotation* RivTextAnnotationPartMgr::rimAnnotation() const { - return m_rimAnnotationLocal ? m_rimAnnotationLocal : m_rimAnnotationInView->sourceAnnotation(); + if (m_rimAnnotationLocal) return m_rimAnnotationLocal; + + return m_rimAnnotationInView->sourceAnnotation(); } //--------------------------------------------------------------------------------------------------