From bb5f6e1bca67c56d7df94b3f877eecb26db39d79 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Mon, 16 Feb 2015 22:13:03 +0100
Subject: [PATCH] Renamed member variable of SimpleSphereGeometry from _planet
 to _sphere

---
 .../rendering/planets/simplespheregeometry.h   |  2 +-
 src/rendering/planets/simplespheregeometry.cpp | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/include/openspace/rendering/planets/simplespheregeometry.h b/include/openspace/rendering/planets/simplespheregeometry.h
index 2bbc012261..f2e7df8691 100644
--- a/include/openspace/rendering/planets/simplespheregeometry.h
+++ b/include/openspace/rendering/planets/simplespheregeometry.h
@@ -52,7 +52,7 @@ private:
     properties::Vec2Property _radius;
     properties::IntProperty _segments;
 
-    PowerScaledSphere* _planet;
+    PowerScaledSphere* _sphere;
 };
 
 }  // namespace planetgeometry
diff --git a/src/rendering/planets/simplespheregeometry.cpp b/src/rendering/planets/simplespheregeometry.cpp
index d57ce7de9d..7a5dd02f17 100644
--- a/src/rendering/planets/simplespheregeometry.cpp
+++ b/src/rendering/planets/simplespheregeometry.cpp
@@ -46,7 +46,7 @@ SimpleSphereGeometry::SimpleSphereGeometry(const ghoul::Dictionary& dictionary)
     , _radius("radius", "Radius", glm::vec2(1.f, 0.f), glm::vec2(-10.f, -20.f),
               glm::vec2(10.f, 20.f))
     , _segments("segments", "Segments", 20, 1, 50)
-    , _planet(nullptr)
+    , _sphere(nullptr)
 {
 	using constants::scenegraphnode::keyName;
 	using constants::simplespheregeometry::keyRadius;
@@ -94,14 +94,14 @@ bool SimpleSphereGeometry::initialize(RenderablePlanet* parent)
 
 void SimpleSphereGeometry::deinitialize()
 {
-	if (_planet)
-	    delete _planet;
-    _planet = nullptr;
+	if (_sphere)
+	    delete _sphere;
+    _sphere = nullptr;
 }
 
 void SimpleSphereGeometry::render()
 {
-    _planet->render();
+    _sphere->render();
 }
 
 void SimpleSphereGeometry::createSphere()
@@ -111,11 +111,11 @@ void SimpleSphereGeometry::createSphere()
     PowerScaledScalar planetSize(_radius);
     _parent->setBoundingSphere(planetSize);
 
-    if(_planet)
-        delete _planet;
+    if(_sphere)
+        delete _sphere;
 
-    _planet = new PowerScaledSphere(planetSize, _segments);
-    _planet->initialize();
+    _sphere = new PowerScaledSphere(planetSize, _segments);
+    _sphere->initialize();
 }
 
 }  // namespace planetgeometry