From 1db7a29e664fbdc739a8bfa43306789f8c809eb9 Mon Sep 17 00:00:00 2001
From: Martin Dobias <wonder.sk@gmail.com>
Date: Sun, 4 Nov 2018 19:52:36 +0100
Subject: [PATCH] [3d] Fix crash in terrain generator if DEM raster layer is
 missing

(cherry picked from commit 685806bccf0ce9354989140317215394482f879d)
---
 src/3d/terrain/qgsdemterraingenerator.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/3d/terrain/qgsdemterraingenerator.cpp b/src/3d/terrain/qgsdemterraingenerator.cpp
index 91e93a5333cb..2b60cb854ed9 100644
--- a/src/3d/terrain/qgsdemterraingenerator.cpp
+++ b/src/3d/terrain/qgsdemterraingenerator.cpp
@@ -66,7 +66,10 @@ QgsRectangle QgsDemTerrainGenerator::extent() const
 float QgsDemTerrainGenerator::heightAt( double x, double y, const Qgs3DMapSettings &map ) const
 {
   Q_UNUSED( map );
-  return mHeightMapGenerator->heightAt( x, y );
+  if ( mHeightMapGenerator )
+    return mHeightMapGenerator->heightAt( x, y );
+  else
+    return 0;
 }
 
 void QgsDemTerrainGenerator::writeXml( QDomElement &elem ) const