UniformFactory: merge current uniform per <name> of effect

Effects/agriculture.eff

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PropertyList>
-  <name>Effects/agriculture</name>
   <inherits-from>Effects/crop</inherits-from> 
   <parameters>
     <material>

Effects/airfield.eff

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PropertyList>
-	<name>Effects/airfield</name>
 	<inherits-from>Effects/terrain-default</inherits-from>
  	<parameters>
 		<texture n="13">

Effects/ambient.eff

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PropertyList>
-	<name>Effects/ambient</name>
 	<parameters>
 		<ambient-occlusion type="bool"><use>/sim/rendering/rembrandt/ambient-occlusion</use></ambient-occlusion>
 		<ambient-occlusion-strength type="float"><use>/sim/rendering/rembrandt/ambient-occlusion-strength</use></ambient-occlusion-strength>

Effects/bloom-blur-1.eff

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PropertyList>
-	<name>Effects/bloom-blur-1</name>
 	<inherits-from>Effects/blur</inherits-from>
 	<parameters>
 		<blurOffset_x>4.0</blurOffset_x>

Effects/bloom-blur-2.eff

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PropertyList>
-	<name>Effects/bloom-blur-2</name>
 	<inherits-from>Effects/blur</inherits-from>
 	<parameters>
 		<blurOffset_x>0.0</blurOffset_x>

Effects/bloom-combine.eff

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PropertyList>
-	<name>Effects/bloom-combine</name>
 	<parameters>
 	</parameters>
 	<technique n="11">

Effects/blur.eff

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PropertyList>
-	<name>Effects/blur</name>
 	<parameters>
 		<blurOffset_x>0.0</blurOffset_x>
 		<blurOffset_y>0.0</blurOffset_y>

Effects/bowwave.eff

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PropertyList>
-	<name>Effects/bowwave</name>
 	<inherits-from>Effects/model-default</inherits-from>
 	<parameters>
 		<texture n="0">

Effects/building.eff

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PropertyList>
-  <name>Effects/building</name>
   <inherits-from>Effects/model-combined-deferred</inherits-from>
   <parameters>
     <texture n="0">

Effects/bumpspec.eff

@@ -28,7 +28,6 @@ in Aircraft/A320/Models/Effects/a320_bumpspec.eff ( or whatever, private to the
 </PropertyList>
 -->
 <PropertyList>
-  <name>Effects/bumpspec</name>
   <inherits-from>Effects/model-default</inherits-from>
   <generate>
     <tangent type="int">6</tangent>

Effects/chrome.eff

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PropertyList>
-  <name>Effects/chrome</name>
   <parameters>
     <texture n ="0">
       <type>transparent</type>

Effects/cloud-impostor.eff

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PropertyList>
-  <name>Effects/cloud-impostor</name>
   <parameters>
     <texture n ="0">
     </texture>

Effects/cloud-models.eff

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PropertyList>
-  <name>Effects/cloud-models</name>
   <parameters>
     <texture n ="0">
       <type>white</type>

Effects/cloud-noctilucent.eff

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PropertyList>
-  <name>Effects/cloud-noctilucent</name>
   <parameters>
     <texture n ="0">
     </texture>

Effects/cloud-static.eff

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PropertyList>
-  <name>Effects/cloud-static</name>
   <parameters>
     <texture n ="0">
     </texture>
@@ -64,25 +63,25 @@
         <type>sampler-2d</type>
         <value type="int">0</value>
       </uniform>
-      <uniform>
+      <uniform>
-        <name>terminator</name>
+        <name>terminator</name>
-        <type>float</type>
+        <type>float</type>
-        <value><use>terminator</use></value>
+        <value><use>terminator</use></value>
       </uniform>
-      <uniform>
+      <uniform>
-        <name>altitude</name>
+        <name>altitude</name>
-        <type>float</type>
+        <type>float</type>
-        <value><use>altitude</use></value>
+        <value><use>altitude</use></value>
       </uniform>
-      <uniform>
+      <uniform>
-        <name>cloud_self_shading</name>
+        <name>cloud_self_shading</name>
-        <type>float</type>
+        <type>float</type>
-        <value><use>cloud_self_shading</use></value>
+        <value><use>cloud_self_shading</use></value>
       </uniform>
-      <uniform>
+      <uniform>
-        <name>moonlight</name>
+        <name>moonlight</name>
-        <type>float</type>
+        <type>float</type>
-        <value><use>moonlight</use></value>
+        <value><use>moonlight</use></value>
       </uniform>
       <vertex-program-two-side>true</vertex-program-two-side>
     </pass>
@@ -140,15 +139,15 @@
         <type>sampler-2d</type>
         <value type="int">0</value>
       </uniform>
-      <uniform>
+      <uniform>
-        <name>terminator</name>
+        <name>terminator</name>
-        <type>float</type>
+        <type>float</type>
-        <value><use>terminator</use></value>
+        <value><use>terminator</use></value>
       </uniform>
-      <uniform>
+      <uniform>
-        <name>altitude</name>
+        <name>altitude</name>
-        <type>float</type>
+        <type>float</type>
-        <value><use>altitude</use></value>
+        <value><use>altitude</use></value>
       </uniform>
       <vertex-program-two-side>true</vertex-program-two-side>
     </pass>

Effects/cloud.eff

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PropertyList>
-  <name>Effects/cloud</name>
   <parameters>
     <texture n ="0">
     </texture>

Effects/clouds-box.eff

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PropertyList>
-  <name>Effects/clouds-thin</name>
   <parameters>
     <texture n ="0">
     </texture>

Effects/clouds-layered.eff

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PropertyList>
-  <name>Effects/clouds-layered</name>
   <parameters>
     <texture n ="0">
     </texture>

Effects/clouds-thick.eff

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PropertyList>
-  <name>Effects/clouds-thick</name>
   <parameters>
     <texture n ="0">
     </texture>

Effects/clouds-thin.eff

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PropertyList>
-  <name>Effects/clouds-thin</name>
   <parameters>
     <texture n ="0">
     </texture>

Effects/clouds-thinlayer.eff

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PropertyList>
-  <name>Effects/clouds-layered</name>
   <parameters>
     <texture n ="0">
     </texture>

Effects/crop.eff

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PropertyList>
-  <name>Effects/crop</name>
   <inherits-from>Effects/terrain-default</inherits-from>
   <parameters>
     <texture n="2">

Effects/cropgrass.eff

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PropertyList>
-  <name>Effects/cropgrass</name>
   <inherits-from>Effects/crop</inherits-from>
   <parameters>
     <texture n="2">

Effects/dirt-runway.eff

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PropertyList>
-	<name>Effects/dirt-runway</name>
 	<inherits-from>Effects/runway</inherits-from>
  	<parameters>
 		<texture n="16">

Effects/display.eff

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PropertyList>
-	<name>Effects/display</name>
 	<parameters>
 		<show-buffers type="bool"><use>/sim/rendering/rembrandt/show-buffers</use></show-buffers>
 		<bloom type="bool"><use>/sim/rendering/rembrandt/bloom</use></bloom>

Effects/flutter.eff

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PropertyList>
-	<name>Effects/flutter</name>
 	<inherits-from>Effects/model-default</inherits-from>
 	<parameters>
 		<vertex-program-two-side type="bool">true</vertex-program-two-side>

Effects/fog.eff

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PropertyList>
-	<name>Effects/fog</name>
 	<technique n="11">
 		<pass>
 			<lighting>false</lighting>

Effects/forest.eff

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PropertyList>
-  <name>Effects/forest</name>
   <inherits-from>Effects/terrain-default</inherits-from>
   <parameters>
     <texture n="2">

Effects/glacier.eff

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PropertyList>
-  <name>Effects/glacier</name>
   <inherits-from>Effects/terrain-default</inherits-from>
   <parameters>
     <texture n="2">

Effects/herbtundra.eff

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PropertyList>
-  <name>Effects/herbtundra</name>
   <inherits-from>Effects/terrain-default</inherits-from>
   <parameters>
     <texture n="2">

Effects/landmass-nowood.eff

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PropertyList>
-  <name>Effects/landmass-nowood</name>
   <inherits-from>Effects/landmass</inherits-from>
   <parameters>
     <canopy-height type="float">0.0</canopy-height>

Effects/landmass-scrub.eff

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PropertyList>
-  <name>Effects/landmass-scrub</name>
   <inherits-from>Effects/landmass</inherits-from>
   <parameters>
     <texture n="2">

Effects/landmass.eff

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PropertyList>
-	<name>Effects/landmass</name>
 	<inherits-from>Effects/terrain-default</inherits-from>
 	<parameters>
 		<texture n="2">

Effects/lfeat.eff

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PropertyList>
-  <name>Effects/lfeat</name>
   <inherits-from>Effects/runway</inherits-from>
   <parameters>
 	<material>

Effects/light-cone.eff

@@ -14,7 +14,6 @@ Uses stencil buffer.
 
 
 <PropertyList>
-  <name>Effects/light-cone</name>
   <inherits-from>Effects/model-default</inherits-from>
   <parameters>
     <texture n ="0">

Effects/light-point.eff

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PropertyList>
-	<name>Effects/light-point</name>
 	<parameters></parameters>
 	<technique n="10">
 		<pass>

Effects/light-spot.eff

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PropertyList>
-	<name>Effects/light-spot</name>
 	<parameters></parameters>
 	<technique n="10">
 		<pass>

Effects/lightmap.eff

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PropertyList>
-  <name>Effects/lightmap</name>
   <parameters>
     <texture n ="0">
       <type>white</type>

Effects/material-diffuse.eff

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PropertyList>
-  <name>Effects/material-diffuse</name>
   <parameters>
     <material>
       <color-mode-uniform>1</color-mode-uniform> <!-- DIFFUSE -->

Effects/material-off.eff

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PropertyList>
-  <name>Effects/material-off</name>
   <parameters>
     <material>
       <color-mode-uniform>0</color-mode-uniform> <!-- OFF -->

Effects/model-combined-deferred.eff

@@ -6,7 +6,6 @@ For now it only disables the ubershader under Rembrandt for
 the objects that use it, and replaces it with the default shader.
 -->
 <PropertyList>
-  <name>Effects/model-combined-deferred</name>
   <inherits-from>Effects/model-combined</inherits-from>
 
   <technique n="7">
@@ -624,4 +623,4 @@ the objects that use it, and replaces it with the default shader.
 			</uniform>
 		</pass>
 	</technique>
-</PropertyList>
+</PropertyList>

Effects/model-combined-transparent.eff

@@ -4,7 +4,6 @@ to provide glass/transparent surfaces with the ubershader active,
 and fallback to plain transparency when the model shader is disabled.
 -->
 <PropertyList>
-  <name>Effects/model-combined-transparent</name>
   <inherits-from>Effects/model-combined</inherits-from>
 
   <technique n="7">

Effects/model-combined.eff

@@ -3,7 +3,6 @@
 please see Docs/README.model-combined.eff for documentation
 -->
 <PropertyList>
-	<name>Effects/model-combined</name>
 	<inherits-from>Effects/model-default</inherits-from>
 
 	<parameters>

Effects/model-default.eff

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PropertyList>
-	<name>Effects/model-default</name>
 	<!-- 	<inherits-from>Effects/shadow</inherits-from> -->
 	<parameters>
 		<texture n ="0">

Effects/model-transparent.eff

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PropertyList>
-	<name>Effects/model-transparent</name>
 	<!-- 	<inherits-from>Effects/shadow</inherits-from> -->
 	<parameters>
 		<texture n ="0">

Effects/planet-cloudlayer.eff

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PropertyList>
-	<name>Effects/planet</name>
 	<!-- 	<inherits-from>Effects/shadow</inherits-from> -->
 	<parameters>
 		<texture n ="0">

Effects/planet.eff

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PropertyList>
-	<name>Effects/planet</name>
 	<!-- 	<inherits-from>Effects/shadow</inherits-from> -->
 	<parameters>
 		<texture n ="0">

Effects/rain-layer.eff

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PropertyList>
-  <name>Effects/rain-layer</name>
   <parameters>
     <texture n ="0">
     </texture>
@@ -78,10 +77,10 @@
         <type>float</type>
         <value><use>scattering</use></value>
       </uniform>
-      <uniform>
+      <uniform>
-        <name>terminator</name>
+        <name>terminator</name>
-        <type>float</type>
+        <type>float</type>
-        <value><use>terminator</use></value>
+        <value><use>terminator</use></value>
       </uniform>
       <vertex-program-two-side>true</vertex-program-two-side>
     </pass>
@@ -149,10 +148,10 @@
         <type>float</type>
         <value><use>scattering</use></value>
       </uniform>
-      <uniform>
+      <uniform>
-        <name>terminator</name>
+        <name>terminator</name>
-        <type>float</type>
+        <type>float</type>
-        <value><use>terminator</use></value>
+        <value><use>terminator</use></value>
       </uniform>
       <vertex-program-two-side>true</vertex-program-two-side>
     </pass>

Effects/reflect-bump-spec.eff

@@ -50,7 +50,6 @@ To use your own effect place your efffect file containing something like this:
 EXAMPLES: You can find examples of both usages in the Hunter and Lightning models.
 -->
 <PropertyList>
-	<name>Effects/reflect-bump-spec</name>
 	<inherits-from>Effects/model-default</inherits-from>
 
 	<parameters>
@@ -203,9 +202,9 @@ EXAMPLES: You can find examples of both usages in the Hunter and Lightning model
 				<image>
 					<use>texture[0]/image</use>
 				</image>
-                <type>
+                <type>
-                    <use>texture[0]/type</use>
+                    <use>texture[0]/type</use>
-                </type>
+                </type>
 				<filter>
 					<use>texture[0]/filter</use>
 				</filter>
@@ -225,9 +224,9 @@ EXAMPLES: You can find examples of both usages in the Hunter and Lightning model
 				<image>
 					<use>texture[8]/image</use>
 				</image>
-                <type>
+                <type>
-                    <use>texture[8]/type</use>
+                    <use>texture[8]/type</use>
-                </type>
+                </type>
 				<filter>
 					<use>texture[8]/filter</use>
 				</filter>
@@ -238,7 +237,7 @@ EXAMPLES: You can find examples of both usages in the Hunter and Lightning model
 					<use>texture[8]/wrap-t</use>
 				</wrap-t>
 				<internal-format>
-					<use>texture[8]/internal-format</use>
+					<use>texture[8]/internal-format</use>
 				</internal-format>
 			</texture-unit>
 
@@ -252,9 +251,9 @@ EXAMPLES: You can find examples of both usages in the Hunter and Lightning model
 				<image>
 					<use>texture[4]/image</use>
 				</image>
-                <type>
+                <type>
-                    <use>texture[4]/type</use>
+                    <use>texture[4]/type</use>
-                </type>
+                </type>
 				<filter>
 					<use>texture[4]/filter</use>
 				</filter>
@@ -489,4 +488,4 @@ EXAMPLES: You can find examples of both usages in the Hunter and Lightning model
 			</uniform>
 		</pass>
 	</technique>
-</PropertyList>
+</PropertyList>

Effects/reflect.eff

@@ -48,7 +48,6 @@
 -->
 
 <PropertyList>
-	<name>Effects/reflect</name>
 	<inherits-from>Effects/model-default</inherits-from>
 
 	<parameters>

Effects/rock.eff

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PropertyList>
-	<name>Effects/rock</name>
 	<inherits-from>Effects/terrain-default</inherits-from>
 	<parameters>
 		<!-- light grey rock with pronounced cracks -->

Effects/runway-dds.eff

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PropertyList>
-	<name>Effects/runway-dds</name>
 	<inherits-from>Effects/runway</inherits-from>
 	<parameters>
 		<texture n="4">

Effects/runway.eff

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PropertyList>
-	<name>Effects/runway</name>
 	<inherits-from>Effects/terrain-default</inherits-from>
 	<parameters>
 		<texture n="4">

Effects/skydome.eff

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PropertyList>
-  <name>Effects/skydome</name>
   <parameters>
     <mie><use>/sim/rendering/mie</use></mie>
     <rayleigh><use>/sim/rendering/rayleigh</use></rayleigh>

Effects/ssao-blur-1.eff

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PropertyList>
-	<name>Effects/ssao-blur-1</name>
 	<inherits-from>Effects/blur</inherits-from>
 	<parameters>
 		<blurOffset_x>4.0</blurOffset_x>

Effects/ssao-blur-2.eff

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PropertyList>
-	<name>Effects/ssao-blur-2</name>
 	<inherits-from>Effects/blur</inherits-from>
 	<parameters>
 		<blurOffset_x>0.0</blurOffset_x>

Effects/ssao.eff

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PropertyList>
-	<name>Effects/ssao</name>
 	<parameters>
         <g_scale type="float">1.0</g_scale>
         <g_bias type="float">0.0</g_bias>

Effects/sunlight.eff

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PropertyList>
-	<name>Effects/sunlight</name>
 	<parameters>
 		<filtering><use>/sim/rendering/shadows/filtering</use></filtering>
 	</parameters>

Effects/surface-lights.eff

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PropertyList>
-  <name>Effects/surface-lights</name>
   <parameters>
     <!-- min-size, max-size, size, attenuation, cull-face parameters filled in by C++ code -->
     <texture n="0">

Effects/terrain-default.eff

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PropertyList>
-  <name>Effects/terrain-default</name>
   <!-- <inherits-from>another-effect</inherits-from> -->
   <parameters>
     <material>

Effects/test.eff

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PropertyList>
-	<name>Effects/test</name>
 	<parameters>
 		<texture n ="0">
 		</texture>

Effects/transition-base-dirt.eff

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PropertyList>
-    <name>Effects/transition-base-dirt</name>
     <inherits-from>Effects/transition</inherits-from>
     <parameters>
 		<texture n="3">

Effects/transition-base-grass-inverse.eff

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PropertyList>
-    <name>Effects/transition-base-rock</name>
     <inherits-from>Effects/transition</inherits-from>
     <parameters>
 		<texture n="3">

Effects/transition-base-grass-rock.eff

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PropertyList>
-    <name>Effects/transition-base-grass-rock</name>
     <inherits-from>Effects/transition</inherits-from>
     <parameters>
 		<texture n="2">

Effects/transition-base-rock.eff

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PropertyList>
-    <name>Effects/transition-base-rock</name>
     <inherits-from>Effects/transition</inherits-from>
     <parameters>
 		<texture n="3">

Effects/transition.eff

@@ -12,7 +12,6 @@ parameters :
 -->
 
 <PropertyList>
-	<name>Effects/transition</name>
 	<inherits-from>Effects/terrain-default</inherits-from>
 	<parameters>
 		<texture n="2">

Effects/tree.eff

@@ -12,7 +12,6 @@
 
      Note: no sorting needed! -->
 <PropertyList>
-	<name>Effects/tree</name>
 	<parameters>
 		<texture n ="0">
 		</texture>

Effects/urban.eff

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PropertyList>
-	<name>Effects/urban</name>
 	<inherits-from>Effects/terrain-default</inherits-from>
 	<parameters>
 		<snow-level>

Effects/water-dds.eff

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PropertyList>
-	<name>Effects/water-dds</name>
 	<inherits-from>Effects/water</inherits-from>
 	<parameters>
 		<texture n="0">

Effects/water-inland.eff

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PropertyList>
-	<name>Effects/water-inland</name>
 	<inherits-from>Effects/terrain-default</inherits-from>
 	<parameters>
 		<texture n="0">

Effects/water.eff

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PropertyList>
-	<name>Effects/water</name>
 	<inherits-from>Effects/terrain-default</inherits-from>
 	<parameters>
 		<texture n="0">