From 15dc296a0aa5a11ee2b08a6fc132ad888e160d97 Mon Sep 17 00:00:00 2001
From: Stuart Buchanan <stuart_d_buchanan@yahoo.co.uk>
Date: Tue, 24 Apr 2012 22:33:32 +0100
Subject: [PATCH] Manual merge from data/materials.xml of

532c93cfa06c3be2d5b47cbffe33a89c04433b8a
c32204a079ea204ff10c2961e75e5cea9ae98afc
d66d417dea5dc0cf06222627ba3ccf9de6506630

into the new Materials definitions.
---
 Materials/base/materials-base.xml |  1 +
 Materials/default/materials.xml   | 12 +++---------
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/Materials/base/materials-base.xml b/Materials/base/materials-base.xml
index 9bcec7625..0037315eb 100644
--- a/Materials/base/materials-base.xml
+++ b/Materials/base/materials-base.xml
@@ -229,6 +229,7 @@ Shared parameters for various materials.
 
 <material n="1108">
   <name>RWY_YELLOW_LIGHTS</name>
+  <name>RWY_YELLOW_PULSE_LIGHTS</name>
   <emissive>
     <r>0.92157</r>
     <g>0.84314</g>
diff --git a/Materials/default/materials.xml b/Materials/default/materials.xml
index cec59b488..62ce58ac6 100644
--- a/Materials/default/materials.xml
+++ b/Materials/default/materials.xml
@@ -55,13 +55,11 @@
 <material include="Materials/base/runway_effect.xml">
   <name>pa_shoulder</name>
   <texture>Runway/pa_shoulder.png</texture>
-  <ysize>5</ysize>
 </material>
 
 <material include="Materials/base/runway_effect.xml">
   <name>pa_shoulder_f</name>
   <texture>Runway/pa_shoulder_f.png</texture>
-  <ysize>5</ysize>
 </material>
 
 <material include="Materials/base/runway_effect.xml">
@@ -1569,9 +1567,7 @@
    </equals>
   </condition>
   <name>Sand</name>
-  <texture>Terrain.winter/sand4.png</texture>
-  <texture>Terrain.winter/sand5.png</texture>
-  <texture>Terrain.winter/sand6.png</texture>
+  <texture>Terrain.winter/sand.png</texture>
   <xsize>2000</xsize>
   <ysize>2000</ysize>
   <light-coverage>10000000.0</light-coverage>
@@ -1781,9 +1777,7 @@
   <name>DryLake</name>
   <name>IntermittentReservoir</name>
   <name>IntermittentLake</name>
-  <texture>Terrain.winter/sand1.png</texture>
-  <texture>Terrain.winter/sand2.png</texture>
-  <texture>Terrain.winter/sand3.png</texture>
+  <texture>Terrain.winter/sand.png</texture>
   <xsize>2000</xsize>
   <ysize>2000</ysize>
   <solid>1</solid>
@@ -2140,7 +2134,7 @@
    </equals>
   </condition>
   <name>GolfCourse</name>
-  <texture>Terrain.winter/golfcourse.png</texture>
+  <texture>Terrain.winter/golfcourse1.png</texture>
   <object-mask>Terrain/golfcourse1.mask.png</object-mask>
   <xsize>800</xsize>
   <ysize>800</ysize>