From 4dce07032a7c05abf08374a9b1f95a364afb2d8a Mon Sep 17 00:00:00 2001
From: Malin Ejdbo <malin.ejdbo@gmail.com>
Date: Fri, 11 Jun 2021 08:45:38 +0200
Subject: [PATCH] Fix some small issues

---
 .../pluto/charon/layers/colorlayers/greyscale_usgs.asset   | 2 +-
 .../pluto/layers/colorlayers/greyscale_usgs.asset          | 2 +-
 .../scene/solarsystem/dwarf_planets/pluto/trail.asset      | 2 +-
 .../scene/solarsystem/missions/voyager/voyager2.asset      | 2 +-
 .../solarsystem/planets/jupiter/jupiter_globelabels.asset  | 2 +-
 .../scene/solarsystem/planets/jupiter/trail_earth.asset    | 2 +-
 .../scene/solarsystem/planets/neptune/major_moons.asset    | 2 +-
 .../scene/solarsystem/planets/neptune/trail_earth.asset    | 2 +-
 .../solarsystem/planets/saturn/saturn_globelabels.asset    | 2 +-
 .../scene/solarsystem/planets/saturn/trail_earth.asset     | 4 ++--
 .../scene/solarsystem/planets/uranus/trail_earth.asset     | 2 +-
 data/assets/scene/solarsystem/sun/glare.asset              | 7 -------
 modules/atmosphere/rendering/atmospheredeferredcaster.cpp  | 2 +-
 13 files changed, 13 insertions(+), 20 deletions(-)

diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/layers/colorlayers/greyscale_usgs.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/layers/colorlayers/greyscale_usgs.asset
index 0284eda58d..05aeb630a3 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/layers/colorlayers/greyscale_usgs.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/layers/colorlayers/greyscale_usgs.asset
@@ -14,7 +14,7 @@ asset.export("layer", layer)
 
 
 asset.meta = {
-  Name = "Charon Black & White & White [USGS]",
+  Name = "Charon Black & White [USGS]",
   Version = "1.0",
   Description = [[ Charon New Horizons LORRI MVIC Global Mosaic 300m v1. This detailed,
     high-quality global mosaic of Pluto’s largest moon, Charon, was assembled from nearly
diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/layers/colorlayers/greyscale_usgs.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/layers/colorlayers/greyscale_usgs.asset
index de63a8a609..0bf0135776 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/pluto/layers/colorlayers/greyscale_usgs.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/layers/colorlayers/greyscale_usgs.asset
@@ -14,7 +14,7 @@ asset.export("layer", layer)
 
 
 asset.meta = {
-  Name = "Pluto Black & White & White [USGS]",
+  Name = "Pluto Black & White [USGS]",
   Version = "1.0",
   Description = [[ This detailed, high-quality global mosaic of Pluto was assembled from
     nearly all of the highest-resolution images obtained by the Long-Range
diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/trail.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/trail.asset
index ef7dd49624..129aeea4ea 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/pluto/trail.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/trail.asset
@@ -35,7 +35,7 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { PlutoBarycenterTrail })
 asset.meta = {
   Name = "Pluto Barycenter Trail",
   Version = "1.0",
-  Description = [[ Trail of Pluto as observed by the Sun. Data from
+  Description = [[ Trail of Pluto Barycenter as observed by the Sun. Data from
     NASA Spice (see base spice asset)]],
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/missions/voyager/voyager2.asset b/data/assets/scene/solarsystem/missions/voyager/voyager2.asset
index f2fddaab3c..d2e7e80a17 100644
--- a/data/assets/scene/solarsystem/missions/voyager/voyager2.asset
+++ b/data/assets/scene/solarsystem/missions/voyager/voyager2.asset
@@ -37,7 +37,7 @@ local LightSources = {
     Node = sunTransforms.SolarSystemBarycenter.Identifier,
     Intensity = 1.0
   },
-{
+  {
     Identifier = "Camera",
     Type = "CameraLightSource",
     Intensity = 0.5
diff --git a/data/assets/scene/solarsystem/planets/jupiter/jupiter_globelabels.asset b/data/assets/scene/solarsystem/planets/jupiter/jupiter_globelabels.asset
index c13b0b0f4b..9de72c055c 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/jupiter_globelabels.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/jupiter_globelabels.asset
@@ -1,5 +1,5 @@
 local LabelsPath = asset.syncedResource({
-  Name = "Callisto Labels",
+  Name = "Jupiter Labels",
   Type = "HttpSynchronization",
   Identifier = "jupiter_labels",
   Version = 1
diff --git a/data/assets/scene/solarsystem/planets/jupiter/trail_earth.asset b/data/assets/scene/solarsystem/planets/jupiter/trail_earth.asset
index bffd3012b4..e89618469b 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/trail_earth.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/trail_earth.asset
@@ -36,7 +36,7 @@ asset.meta = {
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
   License = "MIT license",
-  Identifiers = {"VenusTrailEarth"}
+  Identifiers = {"JupiterTrailEarth"}
 }
 
 assetHelper.registerSceneGraphNodesAndExport(asset, { JupiterTrailEarth })
diff --git a/data/assets/scene/solarsystem/planets/neptune/major_moons.asset b/data/assets/scene/solarsystem/planets/neptune/major_moons.asset
index df57e32d64..698924a3e3 100644
--- a/data/assets/scene/solarsystem/planets/neptune/major_moons.asset
+++ b/data/assets/scene/solarsystem/planets/neptune/major_moons.asset
@@ -2,7 +2,7 @@ asset.require('./triton')
 
 
 asset.meta = {
-  Name = "Neptune Minor Moons",
+  Name = "Neptune Major Moons",
   Version = "1.0",
   Description = [[ Meta asset containing Neptune's major moon: Triton]],
   Author = "OpenSpace Team",
diff --git a/data/assets/scene/solarsystem/planets/neptune/trail_earth.asset b/data/assets/scene/solarsystem/planets/neptune/trail_earth.asset
index 520fc1a366..791e8f70dd 100644
--- a/data/assets/scene/solarsystem/planets/neptune/trail_earth.asset
+++ b/data/assets/scene/solarsystem/planets/neptune/trail_earth.asset
@@ -40,5 +40,5 @@ asset.meta = {
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
   License = "MIT license",
-  Identifiers = {"VenusTrailEarth"}
+  Identifiers = {"NeptuneTrailEarth"}
 }
diff --git a/data/assets/scene/solarsystem/planets/saturn/saturn_globelabels.asset b/data/assets/scene/solarsystem/planets/saturn/saturn_globelabels.asset
index cca9ae611b..be23aa78c1 100644
--- a/data/assets/scene/solarsystem/planets/saturn/saturn_globelabels.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/saturn_globelabels.asset
@@ -1,5 +1,5 @@
 local LabelsPath = asset.syncedResource({
-  Name = "Dione Labels",
+  Name = "Saturn Labels",
   Type = "HttpSynchronization",
   Identifier = "saturn_labels",
   Version = 1
diff --git a/data/assets/scene/solarsystem/planets/saturn/trail_earth.asset b/data/assets/scene/solarsystem/planets/saturn/trail_earth.asset
index 37f5fa26f8..545e2e277b 100644
--- a/data/assets/scene/solarsystem/planets/saturn/trail_earth.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/trail_earth.asset
@@ -37,8 +37,8 @@ asset.meta = {
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
   License = "MIT license",
-  Identifiers = {"VenusTrailEarth"}
+  Identifiers = {"SaturnTrailEarth"}
 }
 
 
-assetHelper.registerSceneGraphNodesAndExport(asset, { UranusTrailEarth })
+assetHelper.registerSceneGraphNodesAndExport(asset, { SaturnTrailEarth })
diff --git a/data/assets/scene/solarsystem/planets/uranus/trail_earth.asset b/data/assets/scene/solarsystem/planets/uranus/trail_earth.asset
index b1589707e2..a680c5e429 100644
--- a/data/assets/scene/solarsystem/planets/uranus/trail_earth.asset
+++ b/data/assets/scene/solarsystem/planets/uranus/trail_earth.asset
@@ -40,5 +40,5 @@ asset.meta = {
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
   License = "MIT license",
-  Identifiers = {"VenusTrailEarth"}
+  Identifiers = {"UranusTrailEarth"}
 }
diff --git a/data/assets/scene/solarsystem/sun/glare.asset b/data/assets/scene/solarsystem/sun/glare.asset
index 5c20267d0b..a45d80dd82 100644
--- a/data/assets/scene/solarsystem/sun/glare.asset
+++ b/data/assets/scene/solarsystem/sun/glare.asset
@@ -18,13 +18,6 @@ local SunGlare = {
     Opacity = 0.65,
     RenderableType = "PreDeferredTransparency"
   },
-  Transform = {
-    Translation = {
-      Type = "SpiceTranslation",
-      Target = "SSB",
-      Observer = "SSB"
-    }
-  },
   GUI = {
     Name = "Sun Glare",
     Path = "/Solar System/Sun",
diff --git a/modules/atmosphere/rendering/atmospheredeferredcaster.cpp b/modules/atmosphere/rendering/atmospheredeferredcaster.cpp
index b01c2c604d..33bb35fab1 100644
--- a/modules/atmosphere/rendering/atmospheredeferredcaster.cpp
+++ b/modules/atmosphere/rendering/atmospheredeferredcaster.cpp
@@ -682,7 +682,7 @@ void AtmosphereDeferredcaster::loadComputationPrograms() {
         );
     }
     _irradianceSupTermsProgramObject->setIgnoreUniformLocationError(IgnoreError::Yes);
-    
+
     //
     // InScattering S
     if (!_inScatteringProgramObject) {