From 6f6f77322b03c84fb324586354e7a88015c64130 Mon Sep 17 00:00:00 2001
From: Magne Sjaastad <magne.sjaastad@ceetronsolutions.com>
Date: Thu, 14 Sep 2023 14:46:56 +0200
Subject: [PATCH] Guard null pointer

---
 ApplicationLibCode/ProjectDataModel/Rim3dView.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ApplicationLibCode/ProjectDataModel/Rim3dView.cpp b/ApplicationLibCode/ProjectDataModel/Rim3dView.cpp
index 34b9f9c561..039ad932d0 100644
--- a/ApplicationLibCode/ProjectDataModel/Rim3dView.cpp
+++ b/ApplicationLibCode/ProjectDataModel/Rim3dView.cpp
@@ -1689,7 +1689,7 @@ void Rim3dView::updateScreenSpaceModel()
 
     // Build annotation parts and put into screen space model
     cvf::Collection<cvf::Part> partCollection;
-    m_viewer->currentScene()->allParts( &partCollection );
+    if ( m_viewer->currentScene() ) m_viewer->currentScene()->allParts( &partCollection );
 
     RivAnnotationTools annoTool;
     if ( m_useCustomAnnotationStrategy )