Merge remote-tracking branch 'origin/feature/iSWA' into develop

Conflicts:
	data/scene/default.scene
	scripts/bind_keys.lua

data/scene/fieldlines/fieldlines.mod

@@ -4,6 +4,8 @@ local file3 = '${OPENSPACE_DATA}/scene/fieldlines/bats_seeds/BATS_R_US_open_sout
 local file4 = '${OPENSPACE_DATA}/scene/fieldlines/bats_seeds/BATS_R_US_solar_wind_all.txt';
 local file5 = '${OPENSPACE_DATA}/scene/fieldlines/bats_seeds/BATS_R_US_separatrix_seeds_all.txt';
 
+local volumeFile = '${OPENSPACE_DATA}/batsrus.cdf';
+
 return {
     {
         Name = "Fieldlines1",
@@ -16,7 +18,7 @@ return {
             Type = "RenderableFieldlines",
             VectorField = {
                 Type = "VolumeKameleon",
-                File = "${OPENSPACE_DATA}/batsrus.cdf",
+                File = volumeFile,
                 Model = "BATSRUS",
                 Variables = {"bx", "by", "bz"}
             },
@@ -42,7 +44,7 @@ return {
             Type = "RenderableFieldlines",
             VectorField = {
                 Type = "VolumeKameleon",
-                File = "${OPENSPACE_DATA}/batsrus.cdf",
+                File = volumeFile,
                 Model = "BATSRUS",
                 Variables = {"bx", "by", "bz"}
             },
@@ -68,7 +70,7 @@ return {
             Type = "RenderableFieldlines",
             VectorField = {
                 Type = "VolumeKameleon",
-                File = "${OPENSPACE_DATA}/batsrus.cdf",
+                File = volumeFile,
                 Model = "BATSRUS",
                 Variables = {"bx", "by", "bz"}
             },
@@ -94,7 +96,7 @@ return {
             Type = "RenderableFieldlines",
             VectorField = {
                 Type = "VolumeKameleon",
-                File = "${OPENSPACE_DATA}/batsrus.cdf",
+                File = volumeFile,
                 Model = "BATSRUS",
                 Variables = {"bx", "by", "bz"}
             },
@@ -120,7 +122,7 @@ return {
             Type = "RenderableFieldlines",
             VectorField = {
                 Type = "VolumeKameleon",
-                File = "${OPENSPACE_DATA}/batsrus.cdf",
+                File = volumeFile,
                 Model = "BATSRUS",
                 Variables = {"bx", "by", "bz"}
             },

data/scene/iswa/cdf/fieldlines.json

@@ -0,0 +1,7 @@
+{
+	"Separatrix Seeds": "${OPENSPACE_DATA}/scene/fieldlines/bats_seeds/BATS_R_US_separatrix_seeds_all.txt",
+	"Closed Seeds": "${OPENSPACE_DATA}/scene/fieldlines/bats_seeds/BATS_R_US_closed_seeds_all.txt",
+	"Open North Seeds": "${OPENSPACE_DATA}/scene/fieldlines/bats_seeds/BATS_R_US_open_north_all.txt",
+	"Open South Seeds": "${OPENSPACE_DATA}/scene/fieldlines/bats_seeds/BATS_R_US_open_south_all.txt",
+	"Solar Wind Seeds": "${OPENSPACE_DATA}/scene/fieldlines/bats_seeds/BATS_R_US_solar_wind_all.txt"
+}

data/scene/iswa/tfs/autumn.tf

@@ -0,0 +1 @@
+${SCENE}/iswa/tfs/colormap_autumn.png

data/scene/iswa/tfs/hot.tf

@@ -0,0 +1 @@
+${SCENE}/iswa/tfs/colormap_hot.jpg

data/scene/iswa/tfs/parula.tf

@@ -0,0 +1 @@
+${SCENE}/iswa/tfs/colormap_parula.jpg

data/scene/iswa/tfs/rgb.tf

@@ -0,0 +1,3 @@
+${SCENE}/iswa/tfs/red.jpg
+${SCENE}/iswa/tfs/green.jpg
+${SCENE}/iswa/tfs/blue.jpg

data/scene/newhorizons/pluto/pluto/pluto.mod

@@ -208,7 +208,7 @@ return {
             Size = {1.0, 6.4},
             Origin = "Center",
             Billboard = true,
-            ProjectionListener = true,
+            ProjectionListener = false,
             Texture = "textures/Pluto-Text.png"
         },
         Ephemeris = {