From 551293437483bad3c09d9f48ef1423caa1a0d16b Mon Sep 17 00:00:00 2001
From: Scott Giese <scttgs0@gmail.com>
Date: Mon, 23 Nov 2020 20:55:30 -0600
Subject: [PATCH] Photoscenery: patch to fix missed merge items.

Author: Nathaniel Warner
---
 Shaders/generic-ALS-base.vert | 1 +
 defaults.xml                  | 4 +---
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/Shaders/generic-ALS-base.vert b/Shaders/generic-ALS-base.vert
index f31e3b328..798259b3e 100644
--- a/Shaders/generic-ALS-base.vert
+++ b/Shaders/generic-ALS-base.vert
@@ -80,6 +80,7 @@ void main()
     //vec4 ecPosition = gl_ModelViewMatrix * gl_Vertex;
     gl_Position = ftransform();
     gl_TexCoord[0] = gl_TextureMatrix[0] * gl_MultiTexCoord0;
+    orthoTexCoord = orthophotoTexCoord;
     normal = gl_NormalMatrix * gl_Normal;
     vec4 ambient_color, diffuse_color;
     if (colorMode == MODE_DIFFUSE) {
diff --git a/defaults.xml b/defaults.xml
index 1f804ffed..751884ea7 100644
--- a/defaults.xml
+++ b/defaults.xml
@@ -59,9 +59,7 @@ Started September 2000 by David Megginson, david@megginson.com
         <sun-atlas-size type="int" userarchive="y">2048</sun-atlas-size>
       </shadows>
       <photoscenery>
-        <enabled type="bool" userarchive="y">true</enabled>
-        <pixels-per-meter type="float" userarchive="y">0.25</pixels-per-meter>
-        <auto-download type="bool" userarchive="y">true</auto-download>
+        <enabled type="bool" userarchive="y">false</enabled>
       </photoscenery>
       <debug type="bool">false</debug>
       <realism type="int">5</realism>