From 1d8d750635c2a55bc253ef7d4dd628df40b21aa5 Mon Sep 17 00:00:00 2001
From: Erik Broberg <Erik Broberg>
Date: Wed, 30 Mar 2016 20:13:06 -0400
Subject: [PATCH] Handling case where DistanceSwitch is empty

---
 modules/planetbrowsing/CMakeLists.txt               | 2 +-
 modules/planetbrowsing/rendering/distanceswitch.cpp | 4 ++++
 modules/planetbrowsing/rendering/distanceswitch.h   | 8 ++++----
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/modules/planetbrowsing/CMakeLists.txt b/modules/planetbrowsing/CMakeLists.txt
index 5402965d89..44f0a6c0e4 100644
--- a/modules/planetbrowsing/CMakeLists.txt
+++ b/modules/planetbrowsing/CMakeLists.txt
@@ -26,7 +26,7 @@ include(${OPENSPACE_CMAKE_EXT_DIR}/module_definition.cmake)
 
 set(HEADER_FILES
     ${CMAKE_CURRENT_SOURCE_DIR}/rendering/planet.h
-	${CMAKE_CURRENT_SOURCE_DIR}/rendering/distanceswitch.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/rendering/distanceswitch.h
 )
 source_group("Header Files" FILES ${HEADER_FILES})
 
diff --git a/modules/planetbrowsing/rendering/distanceswitch.cpp b/modules/planetbrowsing/rendering/distanceswitch.cpp
index 42fe4e8ebd..786121c3a9 100644
--- a/modules/planetbrowsing/rendering/distanceswitch.cpp
+++ b/modules/planetbrowsing/rendering/distanceswitch.cpp
@@ -52,6 +52,10 @@ bool DistanceSwitch::isReady() const {
 }
 
 void DistanceSwitch::render(const RenderData& data) {
+	if (_maxDistances.size() == 0) {
+		return;
+	}
+
 	pss pssDistanceToCamera = (data.camera.position() - data.position).length();
 	double distanceToCamera = pssDistanceToCamera.lengthd();
 
diff --git a/modules/planetbrowsing/rendering/distanceswitch.h b/modules/planetbrowsing/rendering/distanceswitch.h
index 366bebcaa1..b866cfabcb 100644
--- a/modules/planetbrowsing/rendering/distanceswitch.h
+++ b/modules/planetbrowsing/rendering/distanceswitch.h
@@ -22,8 +22,8 @@
 * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
 ****************************************************************************************/
 
-#ifndef __DDLODSWITCH_H__
-#define __DDLODSWITCH_H__
+#ifndef __DISTANCESWITCH_H__
+#define __DISTANCESWITCH_H__
 
 // open space includes
 #include <openspace/rendering/renderable.h>
@@ -68,8 +68,8 @@ private:
 	
 
 	std::vector<std::shared_ptr<Renderable>> _renderables;
-	std::vector <double> _distanceThresholds;
+	std::vector <double> _maxDistances;
 
 };
 } // openspace
-#endif //__DDLODSWITCH_H__
+#endif //__DISTANCESWITCH_H__