From a90755c899f9e7df67001d89d5fafb9ccb73b02f Mon Sep 17 00:00:00 2001
From: Magne Sjaastad <magne.sjaastad@ceetronsolutions.com>
Date: Fri, 29 Jun 2018 16:41:35 +0200
Subject: [PATCH] Guard null pointer access

---
 .../Intersections/RivIntersectionGeometryGenerator.cpp          | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ApplicationCode/ModelVisualization/Intersections/RivIntersectionGeometryGenerator.cpp b/ApplicationCode/ModelVisualization/Intersections/RivIntersectionGeometryGenerator.cpp
index b1ed7216d2..0e117e2a77 100644
--- a/ApplicationCode/ModelVisualization/Intersections/RivIntersectionGeometryGenerator.cpp
+++ b/ApplicationCode/ModelVisualization/Intersections/RivIntersectionGeometryGenerator.cpp
@@ -205,6 +205,8 @@ void RivIntersectionGeometryGenerator::calculateArrays()
 {
     if (m_triangleVxes->size()) return;
 
+    if (m_hexGrid.isNull()) return;
+
     m_extrusionDirection.normalize();
     std::vector<cvf::Vec3f> triangleVertices;