From cad2dc9e06d90e263c69d1c755c76d5a57c2d0c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20de=20l=27Hamaide?= <clemaez@hotmail.fr>
Date: Mon, 18 Nov 2013 03:17:58 +0100
Subject: [PATCH] Fix missing elements in texture declaration in effects files.
 Fixes bug #1267

---
 Effects/airfield.eff                      |   3 +
 Effects/bowwave.eff                       |  49 ++++++++
 Effects/building.eff                      |  12 ++
 Effects/bumpspec.eff                      |   2 +
 Effects/cloud-models.eff                  |   3 +
 Effects/crop.eff                          |   5 +-
 Effects/cropgrass.eff                     |   2 +
 Effects/forest.eff                        |   9 +-
 Effects/glacier.eff                       |  10 +-
 Effects/herbtundra.eff                    |  10 +-
 Effects/landmass-scrub.eff                |   1 +
 Effects/landmass.eff                      |  21 +++-
 Effects/lfeat.eff                         |   3 +
 Effects/lightmap.eff                      |   1 +
 Effects/model-combined-deferred.eff       |  27 ++++-
 Effects/model-combined-transparent.eff    |  20 +++-
 Effects/model-combined.eff                |  42 ++++++-
 Effects/model-default.eff                 |   4 +
 Effects/model-transparent.eff             |   5 +-
 Effects/reflect-bump-spec.eff             |  11 +-
 Effects/runway.eff                        |  31 ++++-
 Effects/terrain-default.eff               |  22 ++++
 Effects/transition-base-dirt.eff          |   1 +
 Effects/transition-base-grass-inverse.eff |   1 +
 Effects/transition-base-grass-rock.eff    |   3 +
 Effects/transition-base-rock.eff          |   1 +
 Effects/transition.eff                    |  27 +++++
 Effects/urban.eff                         |  45 ++++++++
 Effects/water-dds.eff                     |   6 +
 Effects/water-inland.eff                  |  78 +++++++++++++
 Effects/water.eff                         | 132 +++++++++++++++++++++-
 31 files changed, 563 insertions(+), 24 deletions(-)

diff --git a/Effects/airfield.eff b/Effects/airfield.eff
index a19b83e29..4aeb477bf 100644
--- a/Effects/airfield.eff
+++ b/Effects/airfield.eff
@@ -5,6 +5,7 @@
  	<parameters>
 		<texture n="13">
 		    <image>Textures.high/Terrain/airport_grass2.png</image>
+			<type>2d</type>
 		    <filter>linear-mipmap-linear</filter>
 		    <wrap-s>repeat</wrap-s>
 		    <wrap-t>repeat</wrap-t>
@@ -95,6 +96,7 @@
       <texture-unit>
         <unit>0</unit>
           <image><use>texture[13]/image</use></image>
+		  <type><use>texture[13]/type</use></type>
           <filter><use>texture[13]/filter</use></filter>
           <wrap-s><use>texture[13]/wrap-s</use></wrap-s>
           <wrap-t><use>texture[13]/wrap-t</use></wrap-t>
@@ -109,6 +111,7 @@
       <texture-unit>
         <unit>6</unit>
           <image><use>texture[10]/image</use></image>
+		  <type><use>texture[10]/type</use></type>
           <filter><use>texture[10]/filter</use></filter>
           <wrap-s><use>texture[10]/wrap-s</use></wrap-s>
           <wrap-t><use>texture[10]/wrap-t</use></wrap-t>
diff --git a/Effects/bowwave.eff b/Effects/bowwave.eff
index 2c2148a06..18e693985 100644
--- a/Effects/bowwave.eff
+++ b/Effects/bowwave.eff
@@ -5,6 +5,7 @@
 	<parameters>
 		<texture n="0">
 			<image>/Textures/Water/water-reflection.png</image>
+			<type>2d</type>
 			<filter>linear-mipmap-linear</filter>
 			<wrap-s>repeat</wrap-s>
 			<wrap-t>repeat</wrap-t>
@@ -12,6 +13,7 @@
 		</texture>
 		<texture n="2">
 			<image>/Textures/Water/perlin-noise-nm.dds</image>
+			<type>2d</type>
 			<filter>linear-mipmap-linear</filter>
 			<wrap-s>repeat</wrap-s>
 			<wrap-t>repeat</wrap-t>
@@ -19,6 +21,7 @@
 		</texture>
 		<texture n="3">
 			<image>/Textures/Water/waves-ver10-dudv.dds</image>
+			<type>2d</type>
 			<filter>linear-mipmap-linear</filter>
 			<wrap-s>repeat</wrap-s>
 			<wrap-t>repeat</wrap-t>
@@ -26,6 +29,7 @@
 		</texture>
 		<texture n="4">
 			<image>/Textures/Water/water-reflection-grey.png</image>
+			<type>2d</type>
 			<filter>linear-mipmap-linear</filter>
 			<wrap-s>repeat</wrap-s>
 			<wrap-t>repeat</wrap-t>
@@ -33,6 +37,7 @@
 		</texture>
 		<texture n="5">
 			<image>/Textures/Water/sea_foam.dds</image>
+			<type>2d</type>
 			<filter>linear-mipmap-linear</filter>
 			<wrap-s>repeat</wrap-s>
 			<wrap-t>repeat</wrap-t>
@@ -40,6 +45,7 @@
 		</texture>
 		<texture n="6">
 			<image>/Textures/Water/bowwave3.dds</image>
+			<type>2d</type>
 			<filter>linear-mipmap-linear</filter>
 			<wrap-s>repeat</wrap-s>
 			<wrap-t>repeat</wrap-t>
@@ -47,6 +53,7 @@
 		</texture>
 		<texture n="7">
 			<image>/Textures/Water/bowwave_normal.dds</image>
+			<type>2d</type>
 			<filter>linear-mipmap-linear</filter>
 			<wrap-s>repeat</wrap-s>
 			<wrap-t>repeat</wrap-t>
@@ -223,6 +230,9 @@
 				<image>
 					<use>texture[0]/image</use>
 				</image>
+                <type>
+                    <use>texture[0]/type</use>
+                </type>
 				<filter>
 					<use>texture[0]/filter</use>
 				</filter>
@@ -245,6 +255,9 @@
 				<image>
 					<use>texture[2]/image</use>
 				</image>
+                <type>
+                    <use>texture[2]/type</use>
+                </type>
 				<filter>
 					<use>texture[2]/filter</use>
 				</filter>
@@ -263,6 +276,9 @@
 				<image>
 					<use>texture[3]/image</use>
 				</image>
+                <type>
+                    <use>texture[3]/type</use>
+                </type>
 				<filter>
 					<use>texture[3]/filter</use>
 				</filter>
@@ -281,6 +297,9 @@
 				<image>
 					<use>texture[4]/image</use>
 				</image>
+                <type>
+                    <use>texture[4]/type</use>
+                </type>
 				<filter>
 					<use>texture[4]/filter</use>
 				</filter>
@@ -299,6 +318,9 @@
 				<image>
 					<use>texture[5]/image</use>
 				</image>
+                <type>
+                    <use>texture[5]/type</use>
+                </type>
 				<filter>
 					<use>texture[5]/filter</use>
 				</filter>
@@ -317,6 +339,9 @@
 				<image>
 					<use>texture[6]/image</use>
 				</image>
+                <type>
+                    <use>texture[6]/type</use>
+                </type>
 				<filter>
 					<use>texture[6]/filter</use>
 				</filter>
@@ -335,6 +360,9 @@
 				<image>
 					<use>texture[7]/image</use>
 				</image>
+                <type>
+                    <use>texture[7]/type</use>
+                </type>
 				<filter>
 					<use>texture[7]/filter</use>
 				</filter>
@@ -619,6 +647,9 @@
 				<image>
 					<use>texture[0]/image</use>
 				</image>
+                <type>
+                    <use>texture[0]/type</use>
+                </type>
 				<filter>
 					<use>texture[0]/filter</use>
 				</filter>
@@ -641,6 +672,9 @@
 				<image>
 					<use>texture[2]/image</use>
 				</image>
+                <type>
+                    <use>texture[2]/type</use>
+                </type>
 				<filter>
 					<use>texture[2]/filter</use>
 				</filter>
@@ -659,6 +693,9 @@
 				<image>
 					<use>texture[3]/image</use>
 				</image>
+                <type>
+                    <use>texture[3]/type</use>
+                </type>
 				<filter>
 					<use>texture[3]/filter</use>
 				</filter>
@@ -677,6 +714,9 @@
 				<image>
 					<use>texture[4]/image</use>
 				</image>
+                <type>
+                    <use>texture[4]/type</use>
+                </type>
 				<filter>
 					<use>texture[4]/filter</use>
 				</filter>
@@ -695,6 +735,9 @@
 				<image>
 					<use>texture[5]/image</use>
 				</image>
+                <type>
+                    <use>texture[5]/type</use>
+                </type>
 				<filter>
 					<use>texture[5]/filter</use>
 				</filter>
@@ -713,6 +756,9 @@
 				<image>
 					<use>texture[6]/image</use>
 				</image>
+                <type>
+                    <use>texture[6]/type</use>
+                </type>
 				<filter>
 					<use>texture[6]/filter</use>
 				</filter>
@@ -731,6 +777,9 @@
 				<image>
 					<use>texture[7]/image</use>
 				</image>
+                <type>
+                    <use>texture[7]/type</use>
+                </type>
 				<filter>
 					<use>texture[7]/filter</use>
 				</filter>
diff --git a/Effects/building.eff b/Effects/building.eff
index 252860104..4f6657ba2 100644
--- a/Effects/building.eff
+++ b/Effects/building.eff
@@ -18,6 +18,7 @@
     <!-- Light Map -->
     <texture n="3">
       <image>Textures/buildings-lightmap.png</image>
+	  <type>2d</type>
       <filter>linear-mipmap-linear</filter>
       <wrap-s>clamp</wrap-s>
       <wrap-t>clamp</wrap-t>
@@ -164,6 +165,9 @@
 		  <image>
 			  <use>texture[3]/image</use>
 		  </image>
+          <type>
+              <use>texture[3]/type</use>
+          </type>
 		  <filter>
 			  <use>texture[3]/filter</use>
 		  </filter>
@@ -224,6 +228,7 @@
       <texture-unit>
         <unit>0</unit>
           <image><use>texture[0]/image</use></image>
+		  <type><use>texture[0]/type</use></type>
           <filter><use>texture[0]/filter</use></filter>
           <wrap-s><use>texture[0]/wrap-s</use></wrap-s>
           <wrap-t><use>texture[0]/wrap-t</use></wrap-t>
@@ -267,6 +272,7 @@
       <texture-unit>
         <unit>0</unit>
           <image><use>texture[0]/image</use></image>
+		  <type><use>texture[0]/type</use></type>
           <filter><use>texture[0]/filter</use></filter>
           <wrap-s><use>texture[0]/wrap-s</use></wrap-s>
           <wrap-t><use>texture[0]/wrap-t</use></wrap-t>
@@ -357,6 +363,9 @@
 		<image> 
 		  <use>texture[3]/image</use>
 		</image>
+        <type>
+            <use>texture[3]/type</use>
+        </type>
 		<filter>
 		  <use>texture[3]/filter</use>
 		</filter>
@@ -409,6 +418,9 @@
 		<image> 
 		  <use>texture[3]/image</use>
 		</image>
+        <type>
+            <use>texture[3]/type</use>
+        </type>
 		<filter>
 		  <use>texture[3]/filter</use>
 		</filter>
diff --git a/Effects/bumpspec.eff b/Effects/bumpspec.eff
index 41fcf0f03..968300b37 100644
--- a/Effects/bumpspec.eff
+++ b/Effects/bumpspec.eff
@@ -57,6 +57,7 @@ in Aircraft/A320/Models/Effects/a320_bumpspec.eff ( or whatever, private to the
       <texture-unit>
         <unit>0</unit>
         <image><use>texture[0]/image</use></image>
+		<type><use>texture[0]/type</use></type>
         <filter><use>texture[0]/filter</use></filter>
         <wrap-s><use>texture[0]/wrap-s</use></wrap-s>
         <wrap-t><use>texture[0]/wrap-t</use></wrap-t>
@@ -65,6 +66,7 @@ in Aircraft/A320/Models/Effects/a320_bumpspec.eff ( or whatever, private to the
       <texture-unit>
         <unit>1</unit>
         <image><use>texture[2]/image</use></image>
+		<type><use>texture[2]/type</use></type>
         <filter><use>texture[2]/filter</use></filter>
         <wrap-s><use>texture[2]/wrap-s</use></wrap-s>
         <wrap-t><use>texture[2]/wrap-t</use></wrap-t>
diff --git a/Effects/cloud-models.eff b/Effects/cloud-models.eff
index c60336161..488ca3356 100644
--- a/Effects/cloud-models.eff
+++ b/Effects/cloud-models.eff
@@ -94,6 +94,9 @@
       <texture-unit>
         <active><use>texture[0]/active</use></active>
         <unit>0</unit>
+        <type>
+            <use>texture[0]/type</use>
+        </type>
           <image><use>texture[0]/image</use></image>
           <filter><use>texture[0]/filter</use></filter>
           <wrap-s><use>texture[0]/wrap-s</use></wrap-s>
diff --git a/Effects/crop.eff b/Effects/crop.eff
index 9bc934808..5e7d265fa 100644
--- a/Effects/crop.eff
+++ b/Effects/crop.eff
@@ -5,6 +5,7 @@
   <parameters>
     <texture n="2">
         <image>Textures/Terrain/crop.png</image>
+		<type>2d</type>
         <filter>linear-mipmap-linear</filter>
         <wrap-s>repeat</wrap-s>
         <wrap-t>repeat</wrap-t>
@@ -12,6 +13,7 @@
     </texture>
     <texture n="3">
         <image>Textures/Terrain/crop-colors.png</image>
+		<type>1d</type>
         <filter>linear-mipmap-linear</filter>
         <wrap-s>mirror</wrap-s>
         <internal-format>normalized</internal-format>
@@ -67,6 +69,7 @@
       <texture-unit>
         <unit>1</unit>
           <image><use>texture[2]/image</use></image>
+		  <type><use>texture[2]/type</use></type>
           <filter><use>texture[2]/filter</use></filter>
           <wrap-s><use>texture[2]/wrap-s</use></wrap-s>
           <wrap-t><use>texture[2]/wrap-t</use></wrap-t>
@@ -76,7 +79,7 @@
       </texture-unit>
       <texture-unit>
         <unit>2</unit>
-          <type>1d</type>
+		<type><use>texture[3]/type</use></type>
           <image><use>texture[3]/image</use></image>
           <filter><use>texture[3]/filter</use></filter>
           <wrap-s><use>texture[3]/wrap-s</use></wrap-s>
diff --git a/Effects/cropgrass.eff b/Effects/cropgrass.eff
index 7ca55d597..04a904d76 100644
--- a/Effects/cropgrass.eff
+++ b/Effects/cropgrass.eff
@@ -5,6 +5,7 @@
   <parameters>
     <texture n="2">
         <image>Textures/Terrain/cropgrass.png</image>
+		<type>2d</type>
         <filter>linear-mipmap-linear</filter>
         <wrap-s>repeat</wrap-s>
         <wrap-t>repeat</wrap-t>
@@ -12,6 +13,7 @@
     </texture>
     <texture n="3">
         <image>Textures/Terrain/cropgrass-colors.png</image>
+		<type>1d</type>
         <filter>linear-mipmap-linear</filter>
         <wrap-s>mirror</wrap-s>
         <internal-format>normalized</internal-format>
diff --git a/Effects/forest.eff b/Effects/forest.eff
index df29c1c02..da3a1f130 100644
--- a/Effects/forest.eff
+++ b/Effects/forest.eff
@@ -9,12 +9,14 @@
         <wrap-s>repeat</wrap-s>
         <wrap-t>repeat</wrap-t>
         <internal-format>normalized</internal-format>
+		<type>2d</type>
     </texture>
     <texture n="3">
         <image>Textures/Terrain/forest-colors.png</image>
         <filter>linear-mipmap-linear</filter>
         <wrap-s>mirror</wrap-s>
         <internal-format>normalized</internal-format>
+		<type>1d</type>
     </texture>
     <texture n="4">
         <image>Textures/Terrain/forest.png</image>
@@ -22,6 +24,7 @@
         <wrap-s>repeat</wrap-s>
         <wrap-t>repeat</wrap-t>
         <internal-format>normalized</internal-format>
+		<type>2d</type>
     </texture>
     <texture n="5">
       <image>Textures.high/Terrain/forest-relief.png</image>
@@ -29,6 +32,7 @@
       <wrap-s>repeat</wrap-s>
       <wrap-t>repeat</wrap-t>
       <internal-format>normalized</internal-format>
+	  <type>2d</type>
     </texture>
     <snow-level><use>/environment/snow-level-m</use></snow-level>
     <depth-factor type="float">0.04</depth-factor>
@@ -114,6 +118,7 @@
       </texture-unit>
       <texture-unit>
         <unit>1</unit>
+		  <type><use>texture[2]/type</use></type>
           <image><use>texture[2]/image</use></image>
           <filter><use>texture[2]/filter</use></filter>
           <wrap-s><use>texture[2]/wrap-s</use></wrap-s>
@@ -124,7 +129,7 @@
       </texture-unit>
       <texture-unit>
         <unit>3</unit>
-          <type>1d</type>
+		  <type><use>texture[3]/type</use></type>
           <image><use>texture[3]/image</use></image>
           <filter><use>texture[3]/filter</use></filter>
           <wrap-s><use>texture[3]/wrap-s</use></wrap-s>
@@ -134,6 +139,7 @@
       </texture-unit>
       <texture-unit>
         <unit>2</unit>
+		  <type><use>texture[4]/type</use></type>
           <image><use>texture[4]/image</use></image>
           <filter><use>texture[4]/filter</use></filter>
           <wrap-s><use>texture[4]/wrap-s</use></wrap-s>
@@ -144,6 +150,7 @@
       </texture-unit>
       <texture-unit>
         <unit>5</unit>
+		<type><use>texture[5]/type</use></type>
         <image><use>texture[5]/image</use></image>
         <filter><use>texture[5]/filter</use></filter>
         <wrap-s><use>texture[5]/wrap-s</use></wrap-s>
diff --git a/Effects/glacier.eff b/Effects/glacier.eff
index f51c1fdd8..ae1890ae7 100644
--- a/Effects/glacier.eff
+++ b/Effects/glacier.eff
@@ -5,6 +5,7 @@
   <parameters>
     <texture n="2">
         <image>Textures/Terrain/rock.png</image>
+		<type>2d</type>
         <filter>linear-mipmap-linear</filter>
         <wrap-s>repeat</wrap-s>
         <wrap-t>repeat</wrap-t>
@@ -12,12 +13,14 @@
     </texture>
     <texture n="3">
         <image>Textures/Terrain/forest-colors.png</image>
+		<type>1d</type>
         <filter>linear-mipmap-linear</filter>
         <wrap-s>mirror</wrap-s>
         <internal-format>normalized</internal-format>
     </texture>
     <texture n="4">
         <image>Textures/Terrain/forest.png</image>
+		<type>2d</type>
         <filter>linear-mipmap-linear</filter>
         <wrap-s>repeat</wrap-s>
         <wrap-t>repeat</wrap-t>
@@ -25,6 +28,7 @@
     </texture>
     <texture n="5">
       <image>Textures.high/Terrain/forest-relief.png</image>
+	  <type>2d</type>
       <filter>linear-mipmap-linear</filter>
       <wrap-s>repeat</wrap-s>
       <wrap-t>repeat</wrap-t>
@@ -40,7 +44,6 @@
     <season-green type="float">0.86</season-green>
     <season-blue type="float">0.22</season-blue>
     <!-- end season color -->
-
 		<!--fog include-->
 		<visibility>
 			<use>/environment/ground-visibility-m</use>
@@ -116,6 +119,7 @@
       <texture-unit>
         <unit>1</unit>
           <image><use>texture[2]/image</use></image>
+		  <type><use>texture[2]/type</use></type>
           <filter><use>texture[2]/filter</use></filter>
           <wrap-s><use>texture[2]/wrap-s</use></wrap-s>
           <wrap-t><use>texture[2]/wrap-t</use></wrap-t>
@@ -125,8 +129,8 @@
       </texture-unit>
       <texture-unit>
         <unit>3</unit>
-          <type>1d</type>
           <image><use>texture[3]/image</use></image>
+		  <type><use>texture[3]/type</use></type>
           <filter><use>texture[3]/filter</use></filter>
           <wrap-s><use>texture[3]/wrap-s</use></wrap-s>
           <internal-format>
@@ -136,6 +140,7 @@
       <texture-unit>
         <unit>2</unit>
           <image><use>texture[4]/image</use></image>
+		  <type><use>texture[4]/type</use></type>
           <filter><use>texture[4]/filter</use></filter>
           <wrap-s><use>texture[4]/wrap-s</use></wrap-s>
           <wrap-t><use>texture[4]/wrap-t</use></wrap-t>
@@ -146,6 +151,7 @@
       <texture-unit>
         <unit>5</unit>
         <image><use>texture[5]/image</use></image>
+		<type><use>texture[5]/type</use></type>
         <filter><use>texture[5]/filter</use></filter>
         <wrap-s><use>texture[5]/wrap-s</use></wrap-s>
         <wrap-t><use>texture[5]/wrap-t</use></wrap-t>
diff --git a/Effects/herbtundra.eff b/Effects/herbtundra.eff
index 079f15b8a..8135565e0 100644
--- a/Effects/herbtundra.eff
+++ b/Effects/herbtundra.eff
@@ -5,6 +5,7 @@
   <parameters>
     <texture n="2">
         <image>Textures/Terrain/rock.png</image>
+		<type>2d</type>
         <filter>linear-mipmap-linear</filter>
         <wrap-s>repeat</wrap-s>
         <wrap-t>repeat</wrap-t>
@@ -12,12 +13,14 @@
     </texture>
     <texture n="3">
         <image>Textures/Terrain/forest-colors.png</image>
+		<type>1d</type>
         <filter>linear-mipmap-linear</filter>
         <wrap-s>mirror</wrap-s>
         <internal-format>normalized</internal-format>
     </texture>
     <texture n="4">
         <image>Textures/Terrain/forest.png</image>
+		<type>2d</type>
         <filter>linear-mipmap-linear</filter>
         <wrap-s>repeat</wrap-s>
         <wrap-t>repeat</wrap-t>
@@ -25,6 +28,7 @@
     </texture>
     <texture n="5">
       <image>Textures.high/Terrain/forest-relief.png</image>
+	  <type>2d</type>
       <filter>linear-mipmap-linear</filter>
       <wrap-s>repeat</wrap-s>
       <wrap-t>repeat</wrap-t>
@@ -116,6 +120,7 @@
       <texture-unit>
         <unit>1</unit>
           <image><use>texture[2]/image</use></image>
+		  <type><use>texture[2]/type</use></type>
           <filter><use>texture[2]/filter</use></filter>
           <wrap-s><use>texture[2]/wrap-s</use></wrap-s>
           <wrap-t><use>texture[2]/wrap-t</use></wrap-t>
@@ -125,8 +130,8 @@
       </texture-unit>
       <texture-unit>
         <unit>3</unit>
-          <type>1d</type>
           <image><use>texture[3]/image</use></image>
+		  <type><use>texture[3]/type</use></type>
           <filter><use>texture[3]/filter</use></filter>
           <wrap-s><use>texture[3]/wrap-s</use></wrap-s>
           <internal-format>
@@ -136,6 +141,7 @@
       <texture-unit>
         <unit>2</unit>
           <image><use>texture[4]/image</use></image>
+		  <type><use>texture[4]/type</use></type>
           <filter><use>texture[4]/filter</use></filter>
           <wrap-s><use>texture[4]/wrap-s</use></wrap-s>
           <wrap-t><use>texture[4]/wrap-t</use></wrap-t>
@@ -146,6 +152,7 @@
       <texture-unit>
         <unit>5</unit>
         <image><use>texture[5]/image</use></image>
+		<type><use>texture[5]/type</use></type>
         <filter><use>texture[5]/filter</use></filter>
         <wrap-s><use>texture[5]/wrap-s</use></wrap-s>
         <wrap-t><use>texture[5]/wrap-t</use></wrap-t>
@@ -154,7 +161,6 @@
         </internal-format>
       </texture-unit>
       <program>
-<!-- 				<vertex-shader n="0">Shaders/include_fog.vert</vertex-shader> -->
 				<vertex-shader n="1">Shaders/forest.vert</vertex-shader>
 				<fragment-shader n="0">Shaders/include_fog.frag</fragment-shader>
 				<fragment-shader n="1">Shaders/forest.frag</fragment-shader>
diff --git a/Effects/landmass-scrub.eff b/Effects/landmass-scrub.eff
index a685ed8a4..01d6a74dc 100644
--- a/Effects/landmass-scrub.eff
+++ b/Effects/landmass-scrub.eff
@@ -5,6 +5,7 @@
   <parameters>
     <texture n="2">
       <image>Textures.high/Terrain/shrubcover-relief.png</image>
+	  <type>2d</type>
       <filter>linear-mipmap-linear</filter>
       <wrap-s>repeat</wrap-s>
       <wrap-t>repeat</wrap-t>
diff --git a/Effects/landmass.eff b/Effects/landmass.eff
index 2638bb34f..b5ef6e6a8 100644
--- a/Effects/landmass.eff
+++ b/Effects/landmass.eff
@@ -5,6 +5,7 @@
 	<parameters>
 		<texture n="2">
 			<image>Textures.high/Terrain/forest-relief.png</image>
+			<type>2d</type>
 			<filter>linear-mipmap-linear</filter>
 			<wrap-s>repeat</wrap-s>
 			<wrap-t>repeat</wrap-t>
@@ -18,8 +19,6 @@
 		<quality-level>
 			<use>/sim/rendering/shaders/landmass</use>
 		</quality-level>
-	</parameters>
-
 	<!--fog include-->
 	<visibility>
 		<use>/environment/ground-visibility-m</use>
@@ -40,6 +39,7 @@
 		<use>/sim/rendering/shaders/skydome</use>
 	</fogtype>
 	<!-- 	END fog include -->
+	</parameters>
 
 	<generate>
 		<tangent type="int">6</tangent>
@@ -101,6 +101,9 @@
 				<image>
 					<use>texture[0]/image</use>
 				</image>
+				<type>
+					<use>texture[0]/type</use>
+				</type>
 				<filter>
 					<use>texture[0]/filter</use>
 				</filter>
@@ -190,8 +193,8 @@
 				</value>
 			</uniform>
 			<!-- 			END fog include -->
-
 		</pass>
+
 		<pass>
 			<lighting>true</lighting>
 			<material>
@@ -231,6 +234,9 @@
 				<image>
 					<use>texture[0]/image</use>
 				</image>
+				<type>
+					<use>texture[0]/type</use>
+				</type>
 				<filter>
 					<use>texture[0]/filter</use>
 				</filter>
@@ -249,6 +255,9 @@
 				<image>
 					<use>texture[2]/image</use>
 				</image>
+				<type>
+					<use>texture[2]/type</use>
+				</type>
 				<filter>
 					<use>texture[2]/filter</use>
 				</filter>
@@ -435,6 +444,9 @@
 				<image>
 					<use>texture[0]/image</use>
 				</image>
+				<type>
+					<use>texture[0]/type</use>
+				</type>
 				<filter>
 					<use>texture[0]/filter</use>
 				</filter>
@@ -453,6 +465,9 @@
 				<image>
 					<use>texture[2]/image</use>
 				</image>
+				<type>
+					<use>texture[2]/type</use>
+				</type>
 				<filter>
 					<use>texture[2]/filter</use>
 				</filter>
diff --git a/Effects/lfeat.eff b/Effects/lfeat.eff
index debb122f3..9f396810e 100644
--- a/Effects/lfeat.eff
+++ b/Effects/lfeat.eff
@@ -61,6 +61,9 @@
 		<image>
 		  <use>texture[0]/image</use>
 		</image>
+        <type>
+            <use>texture[0]/type</use>
+        </type>
 		<filter>
 		  <use>texture[0]/filter</use>
 		</filter>
diff --git a/Effects/lightmap.eff b/Effects/lightmap.eff
index d615fbf6a..e3c8b5f5d 100644
--- a/Effects/lightmap.eff
+++ b/Effects/lightmap.eff
@@ -201,6 +201,7 @@
         <active><use>texture[0]/active</use></active>
         <unit>0</unit>
           <image><use>texture[0]/image</use></image>
+		  <type><use>texture[0]/type</use></type>
           <filter><use>texture[0]/filter</use></filter>
           <wrap-s><use>texture[0]/wrap-s</use></wrap-s>
           <wrap-t><use>texture[0]/wrap-t</use></wrap-t>
diff --git a/Effects/model-combined-deferred.eff b/Effects/model-combined-deferred.eff
index 8853d2ceb..c5370cd29 100644
--- a/Effects/model-combined-deferred.eff
+++ b/Effects/model-combined-deferred.eff
@@ -93,6 +93,9 @@ the objects that use it, and replaces it with the default shader.
 				<image>
 					<use>texture[0]/image</use>
 				</image>
+                <type>
+                    <use>texture[0]/type</use>
+                </type>
 				<filter>
 					<use>texture[0]/filter</use>
 				</filter>
@@ -117,6 +120,9 @@ the objects that use it, and replaces it with the default shader.
 				<image>
 					<use>texture[2]/image</use>
 				</image>
+                <type>
+                    <use>texture[2]/type</use>
+                </type>
 				<filter>
 					<use>texture[2]/filter</use>
 				</filter>
@@ -136,6 +142,9 @@ the objects that use it, and replaces it with the default shader.
 				<image>
 					<use>texture[3]/image</use>
 				</image>
+                <type>
+                    <use>texture[3]/type</use>
+                </type>
 				<filter>
 					<use>texture[3]/filter</use>
 				</filter>
@@ -155,6 +164,9 @@ the objects that use it, and replaces it with the default shader.
 				<image>
 					<use>texture[4]/image</use>
 				</image>
+                <type>
+                    <use>texture[4]/type</use>
+                </type>
 				<filter>
 					<use>texture[4]/filter</use>
 				</filter>
@@ -189,6 +201,9 @@ the objects that use it, and replaces it with the default shader.
 				<image>
 					<use>texture[6]/image</use>
 				</image>
+                <type>
+                    <use>texture[6]/type</use>
+                </type>
 				<filter>
 					<use>texture[6]/filter</use>
 				</filter>
@@ -203,7 +218,7 @@ the objects that use it, and replaces it with the default shader.
 				</internal-format>
 			</texture-unit>
 			<!-- Reflection rainbow texture unit-->
-			<texture-unit>
+<!--			<texture-unit>
 				<unit>7</unit>
 				<image>
 					<use>texture[7]/image</use>
@@ -220,7 +235,7 @@ the objects that use it, and replaces it with the default shader.
 				<internal-format>
 					<use>texture[7]/internal-format</use>
 				</internal-format>
-			</texture-unit>
+			</texture-unit>-->
 
 
 			<vertex-program-two-side>
@@ -270,7 +285,7 @@ the objects that use it, and replaces it with the default shader.
 				<value type="int">5</value>
 			</uniform>
 
-			<uniform>
+<!--			<uniform>
 				<name>ReflFresnelTex</name>
 				<type>sampler-2d</type>
 				<value type="int">6</value>
@@ -280,6 +295,12 @@ the objects that use it, and replaces it with the default shader.
 				<name>ReflRainbowTex</name>
 				<type>sampler-2d</type>
 				<value type="int">7</value>
+			</uniform>-->
+
+            <uniform>
+                <name>ReflGradientsTex</name>
+                <type>sampler-2d</type>
+                <value type="int">6</value>
 			</uniform>
 
 			<!-- 			NORMAL MAP -->
diff --git a/Effects/model-combined-transparent.eff b/Effects/model-combined-transparent.eff
index 2bc44da31..fceb6a10f 100644
--- a/Effects/model-combined-transparent.eff
+++ b/Effects/model-combined-transparent.eff
@@ -79,10 +79,13 @@ and fallback to plain transparency when the model shader is disabled.
 			  <bin-name>DepthSortedBin</bin-name>
 			</render-bin>
 			<texture-unit>
+              <unit>0</unit>
 			  <active>
 				<use>texture[0]/active</use>
 			  </active>
-			  <unit>0</unit>
+              <type>
+                <use>texture[0]/type</use>
+              </type>
 			  <image>
 				<use>texture[0]/image</use>
 			  </image>
@@ -195,6 +198,9 @@ and fallback to plain transparency when the model shader is disabled.
 			   <image>
 				   <use>texture[0]/image</use>
 			   </image>
+               <type>
+                   <use>texture[0]/type</use>
+               </type>
 			   <filter>
 				   <use>texture[0]/filter</use>
 			   </filter>
@@ -219,6 +225,9 @@ and fallback to plain transparency when the model shader is disabled.
 			   <image>
 				   <use>texture[2]/image</use>
 			   </image>
+               <type>
+                   <use>texture[2]/type</use>
+               </type>
 			   <filter>
 				   <use>texture[2]/filter</use>
 			   </filter>
@@ -238,6 +247,9 @@ and fallback to plain transparency when the model shader is disabled.
 			   <image>
 				   <use>texture[3]/image</use>
 			   </image>
+               <type>
+                   <use>texture[3]/type</use>
+               </type>
 			   <filter>
 				   <use>texture[3]/filter</use>
 			   </filter>
@@ -257,6 +269,9 @@ and fallback to plain transparency when the model shader is disabled.
 			   <image>
 				   <use>texture[4]/image</use>
 			   </image>
+               <type>
+                   <use>texture[4]/type</use>
+               </type>
 			   <filter>
 				   <use>texture[4]/filter</use>
 			   </filter>
@@ -293,6 +308,9 @@ and fallback to plain transparency when the model shader is disabled.
 				   <image>
 					   <use>texture[6]/image</use>
 				   </image>
+                   <type>
+                       <use>texture[6]/type</use>
+                   </type>
 				   <filter>
 					   <use>texture[6]/filter</use>
 				   </filter>
diff --git a/Effects/model-combined.eff b/Effects/model-combined.eff
index 856f06c5f..ddc36214f 100644
--- a/Effects/model-combined.eff
+++ b/Effects/model-combined.eff
@@ -8,15 +8,16 @@ please see Docs/README.model-combined.eff for documentation
 
 	<parameters>
 		<!-- 		Diffuse Texture -->
-		<texture n ="0">
+<!--		<texture n ="0">
 			<type>white</type>
-		</texture>
+		</texture>-->
 		<!-- Normal Map -->
 		<normalmap-enabled type="int">0</normalmap-enabled>
 		<normalmap-dds type="int">0</normalmap-dds>
 		<normalmap-tiling type="float">1.0</normalmap-tiling>
 		<texture n="2">
 			<image>Aircraft/Generic/Effects/null_bumpspec.png</image>
+			<type>2d</type>
 			<filter>linear-mipmap-linear</filter>
 			<wrap-s>clamp</wrap-s>
 			<wrap-t>clamp</wrap-t>
@@ -35,6 +36,7 @@ please see Docs/README.model-combined.eff for documentation
 		<lightmap-color type="vec3d" n="3"> 1.0 1.0 1.0 </lightmap-color>
 		<texture n="3">
 			<image>Aircraft/Generic/Effects/greymap.png</image>
+			<type>2d</type>
 			<filter>linear-mipmap-linear</filter>
 			<wrap-s>clamp</wrap-s>
 			<wrap-t>clamp</wrap-t>
@@ -47,6 +49,7 @@ please see Docs/README.model-combined.eff for documentation
 		<reflection-dynamic type="int">0</reflection-dynamic>
 		<texture n="4">
 			<image>Aircraft/Generic/Effects/ReflectMaps/reflectmap.png</image>
+			<type>2d</type>
 			<filter>linear-mipmap-linear</filter>
 			<wrap-s>clamp</wrap-s>
 			<wrap-t>clamp</wrap-t>
@@ -73,6 +76,7 @@ please see Docs/README.model-combined.eff for documentation
 		<reflection-fresnel type="float">0.1</reflection-fresnel>
 		<texture n="6">
 			<image>Aircraft/Generic/Effects/Gradients.png</image>
+			<type>2d</type>
 			<filter>linear-mipmap-linear</filter>
 			<wrap-s>repeat</wrap-s>
 			<wrap-t>repeat</wrap-t>
@@ -87,6 +91,7 @@ please see Docs/README.model-combined.eff for documentation
 		<grain-magnification type="float">10</grain-magnification>
 		<texture n="7">
 			<image>Textures/Terrain/void.png</image>
+			<type>2d</type>
 			<filter>linear-mipmap-linear</filter>
 			<wrap-s>repeat</wrap-s>
 			<wrap-t>repeat</wrap-t>
@@ -240,6 +245,9 @@ please see Docs/README.model-combined.eff for documentation
 			   <image>
 				   <use>texture[0]/image</use>
 			   </image>
+               <type>
+                   <use>texture[0]/type</use>
+               </type>
 			   <filter>
 				   <use>texture[0]/filter</use>
 			   </filter>
@@ -264,6 +272,9 @@ please see Docs/README.model-combined.eff for documentation
 			   <image>
 				   <use>texture[2]/image</use>
 			   </image>
+               <type>
+                   <use>texture[2]/type</use>
+               </type>
 			   <filter>
 				   <use>texture[2]/filter</use>
 			   </filter>
@@ -283,6 +294,9 @@ please see Docs/README.model-combined.eff for documentation
 			   <image>
 				   <use>texture[3]/image</use>
 			   </image>
+               <type>
+                   <use>texture[3]/type</use>
+               </type>
 			   <filter>
 				   <use>texture[3]/filter</use>
 			   </filter>
@@ -302,6 +316,9 @@ please see Docs/README.model-combined.eff for documentation
 			   <image>
 				   <use>texture[4]/image</use>
 			   </image>
+               <type>
+                   <use>texture[4]/type</use>
+               </type>
 			   <filter>
 				   <use>texture[4]/filter</use>
 			   </filter>
@@ -338,6 +355,9 @@ please see Docs/README.model-combined.eff for documentation
 				   <image>
 					   <use>texture[6]/image</use>
 				   </image>
+                   <type>
+                       <use>texture[6]/type</use>
+                   </type>
 				   <filter>
 					   <use>texture[6]/filter</use>
 				   </filter>
@@ -357,6 +377,9 @@ please see Docs/README.model-combined.eff for documentation
 				   <image>
 			 	   	<use>texture[7]/image</use>
 				   </image>
+                   <type>
+                    <use>texture[7]/type</use>
+                   </type>
 				   <filter>
 			 		<use>texture[7]/filter</use>
 				   </filter>
@@ -899,6 +922,9 @@ please see Docs/README.model-combined.eff for documentation
 		  <image>
 			<use>texture[0]/image</use>
 		  </image>
+          <type>
+            <use>texture[0]/type</use>
+          </type>
 		  <filter>
 			<use>texture[0]/filter</use>
 		  </filter>
@@ -923,6 +949,9 @@ please see Docs/README.model-combined.eff for documentation
 		  <image>
 			<use>texture[2]/image</use>
 		  </image>
+          <type>
+              <use>texture[2]/type</use>
+          </type>
 		  <filter>
 			<use>texture[2]/filter</use>
 		  </filter>
@@ -942,6 +971,9 @@ please see Docs/README.model-combined.eff for documentation
 		  <image>
 			<use>texture[3]/image</use>
 		  </image>
+          <type>
+            <use>texture[3]/type</use>
+          </type>
 		  <filter>
 			<use>texture[3]/filter</use>
 		  </filter>
@@ -961,6 +993,9 @@ please see Docs/README.model-combined.eff for documentation
 		  <image>
 			<use>texture[4]/image</use>
 		  </image>
+          <type>
+              <use>texture[4]/type</use>
+          </type>
 		  <filter>
 			<use>texture[4]/filter</use>
 		  </filter>
@@ -997,6 +1032,9 @@ please see Docs/README.model-combined.eff for documentation
 			<image>
 			  <use>texture[6]/image</use>
 			</image>
+            <type>
+              <use>texture[6]/type</use>
+            </type>
 			<filter>
 			  <use>texture[6]/filter</use>
 			</filter>
diff --git a/Effects/model-default.eff b/Effects/model-default.eff
index e4e4fb344..a7a40b9f7 100644
--- a/Effects/model-default.eff
+++ b/Effects/model-default.eff
@@ -204,6 +204,7 @@
 		</render-bin>
 		<texture-unit>
 			<unit>0</unit>
+			<type><use>texture[0]/type</use></type>
 			<image><use>texture[0]/image</use></image>
 			<filter><use>texture[0]/filter</use></filter>
 			<wrap-s><use>texture[0]/wrap-s</use></wrap-s>
@@ -451,6 +452,9 @@
 				<image>
 					<use>texture[0]/image</use>
 				</image>
+                <type>
+                    <use>texture[0]/type</use>
+                </type>
 				<filter>
 					<use>texture[0]/filter</use>
 				</filter>
diff --git a/Effects/model-transparent.eff b/Effects/model-transparent.eff
index cd0aefbe6..dfde84081 100644
--- a/Effects/model-transparent.eff
+++ b/Effects/model-transparent.eff
@@ -83,10 +83,13 @@
 					<bin-name>DepthSortedBin</bin-name>
 				</render-bin>
 			<texture-unit>
+				<unit>0</unit>
 				<active>
 					<use>texture[0]/active</use>
 				</active>
-				<unit>0</unit>
+                <type>
+                    <use>texture[0]/type</use>
+                </type>
 				<image>
 					<use>texture[0]/image</use>
 				</image>
diff --git a/Effects/reflect-bump-spec.eff b/Effects/reflect-bump-spec.eff
index dcd751558..0ce976f50 100644
--- a/Effects/reflect-bump-spec.eff
+++ b/Effects/reflect-bump-spec.eff
@@ -203,6 +203,9 @@ EXAMPLES: You can find examples of both usages in the Hunter and Lightning model
 				<image>
 					<use>texture[0]/image</use>
 				</image>
+                <type>
+                    <use>texture[0]/type</use>
+                </type>
 				<filter>
 					<use>texture[0]/filter</use>
 				</filter>
@@ -222,6 +225,9 @@ EXAMPLES: You can find examples of both usages in the Hunter and Lightning model
 				<image>
 					<use>texture[8]/image</use>
 				</image>
+                <type>
+                    <use>texture[8]/type</use>
+                </type>
 				<filter>
 					<use>texture[8]/filter</use>
 				</filter>
@@ -232,7 +238,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[0]/internal-format</use>
+					<use>texture[8]/internal-format</use>
 				</internal-format>
 			</texture-unit>
 
@@ -246,6 +252,9 @@ EXAMPLES: You can find examples of both usages in the Hunter and Lightning model
 				<image>
 					<use>texture[4]/image</use>
 				</image>
+                <type>
+                    <use>texture[4]/type</use>
+                </type>
 				<filter>
 					<use>texture[4]/filter</use>
 				</filter>
diff --git a/Effects/runway.eff b/Effects/runway.eff
index 1886dc6a2..d06710f94 100644
--- a/Effects/runway.eff
+++ b/Effects/runway.eff
@@ -9,6 +9,7 @@
 			<wrap-s>repeat</wrap-s>
 			<wrap-t>repeat</wrap-t>
 			<internal-format>normalized</internal-format>
+			<type>2d</type>
 		</texture>
 		<texture n="5">
 			<type>cubemap</type>
@@ -27,6 +28,7 @@
 
 		</texture>
 		<texture n="6">
+			<type>2d</type>
 			<image>Aircraft/Generic/Effects/Rainbow.png</image>
 			<filter>linear-mipmap-linear</filter>
 			<wrap-s>repeat</wrap-s>
@@ -34,6 +36,7 @@
 			<internal-format>normalized</internal-format>
 		</texture>
 		<texture n="7">
+			<type>2d</type>
 			<image>Aircraft/Generic/Effects/FresnelLookUp.png</image>
 			<filter>linear-mipmap-linear</filter>
 			<wrap-s>repeat</wrap-s>
@@ -41,6 +44,7 @@
 			<internal-format>normalized</internal-format>
 		</texture>
 		<texture n="8">
+			<type>2d</type>
 			<image>Textures/Runway/rwy-reflect.png</image>
 			<filter>linear-mipmap-linear</filter>
 			<wrap-s>repeat</wrap-s>
@@ -160,6 +164,7 @@
       </render-bin>
       <texture-unit>
         <unit>0</unit>
+		<type><use>texture[0]/type</use></type>
         <image><use>texture[0]/image</use></image>
         <filter><use>texture[0]/filter</use></filter>
         <wrap-s><use>texture[0]/wrap-s</use></wrap-s>
@@ -168,6 +173,7 @@
       </texture-unit>
      <texture-unit>
         <unit>4</unit>
+		<type><use>texture[4]/type</use></type>
         <image><use>texture[4]/image</use></image>
         <filter><use>texture[4]/filter</use></filter>
         <wrap-s><use>texture[4]/wrap-s</use></wrap-s>
@@ -176,6 +182,7 @@
       </texture-unit>
       <texture-unit>
         <unit>5</unit>
+		<type><use>texture[12]/type</use></type>
         <image><use>texture[12]/image</use></image>
         <filter><use>texture[12]/filter</use></filter>
         <wrap-s><use>texture[12]/wrap-s</use></wrap-s>
@@ -184,6 +191,7 @@
       </texture-unit>
       <texture-unit>
         <unit>6</unit>
+		<type><use>texture[10]/type</use></type>
         <image><use>texture[10]/image</use></image>
         <filter><use>texture[10]/filter</use></filter>
         <wrap-s><use>texture[10]/wrap-s</use></wrap-s>
@@ -192,6 +200,7 @@
       </texture-unit>
       <texture-unit>
         <unit>7</unit>
+		<type><use>texture[11]/type</use></type>
         <image><use>texture[11]/image</use></image>
         <filter><use>texture[11]/filter</use></filter>
         <wrap-s><use>texture[11]/wrap-s</use></wrap-s>
@@ -358,6 +367,9 @@
         <pass>
             <texture-unit>
                 <unit>0</unit>
+				<type>
+					<use>texture[0]/type</use>
+				</type>
                 <image>
                     <use>texture[0]/image</use>
                 </image>
@@ -377,6 +389,9 @@
 
             <texture-unit>
                 <unit>1</unit>
+				<type>
+					<use>texture[8]/type</use>
+				</type>
                 <image>
                     <use>texture[8]/image</use>
                 </image>
@@ -401,6 +416,9 @@
 
             <texture-unit>
                 <unit>4</unit>
+				<type>
+					<use>texture[4]/type</use>
+				</type>
                 <image>
                     <use>texture[4]/image</use>
                 </image>
@@ -683,6 +701,9 @@
 		<pass>
 			<texture-unit>
 				<unit>0</unit>
+				<type>
+					<use>texture[0]/type</use>
+				</type>
 				<image>
 					<use>texture[0]/image</use>
 				</image>
@@ -696,12 +717,15 @@
 					<use>texture[0]/wrap-t</use>
 				</wrap-t>
 				<internal-format>
-					<use>texture[1]/internal-format</use>
+					<use>texture[0]/internal-format</use>
 				</internal-format>
 			</texture-unit>
 
 			<texture-unit>
 				<unit>1</unit>
+				<type>
+					<use>texture[8]/type</use>
+				</type>
 				<image>
 					<use>texture[8]/image</use>
 				</image>
@@ -715,7 +739,7 @@
 					<use>texture[8]/wrap-t</use>
 				</wrap-t>
 				<internal-format>
-					<use>texture[0]/internal-format</use>
+					<use>texture[8]/internal-format</use>
 				</internal-format>
 			</texture-unit>
 
@@ -726,6 +750,9 @@
 
 			<texture-unit>
 				<unit>4</unit>
+				<type>
+					<use>texture[4]/type</use>
+				</type>
 				<image>
 					<use>texture[4]/image</use>
 				</image>
diff --git a/Effects/terrain-default.eff b/Effects/terrain-default.eff
index e3d0e93e2..c62a9e953 100644
--- a/Effects/terrain-default.eff
+++ b/Effects/terrain-default.eff
@@ -20,6 +20,7 @@
     </material>
     <texture n="0">
       <image>Textures/Terrain/unknown.png</image>
+	  <type>2d</type>
       <filter>linear-mipmap-linear</filter>
       <!-- also repeat -->
       <wrap-s>repeat</wrap-s>
@@ -32,6 +33,7 @@
     </texture>
     <texture n="10">
       <image>Textures.high/Terrain/snow3.png</image>
+	  <type>2d</type>
       <filter>linear-mipmap-linear</filter>
       <wrap-s>repeat</wrap-s>
       <wrap-t>repeat</wrap-t>
@@ -39,6 +41,7 @@
     </texture>
     <texture n="11">
       <image>Textures/Terrain/void.png</image>
+	  <type>2d</type>
       <filter>linear-mipmap-linear</filter>
       <wrap-s>repeat</wrap-s>
       <wrap-t>repeat</wrap-t>
@@ -46,6 +49,7 @@
     </texture>
     <texture n="12">
       <image>Textures/Terrain/void.png</image>
+	  <type>2d</type>
       <filter>linear-mipmap-linear</filter>
       <wrap-s>repeat</wrap-s>
       <wrap-t>repeat</wrap-t>
@@ -53,6 +57,7 @@
     </texture>
     <texture n="13">
       <image>Textures.high/Terrain/rock_alt.png</image>
+	  <type>2d</type>
       <filter>linear-mipmap-linear</filter>
       <wrap-s>repeat</wrap-s>
       <wrap-t>repeat</wrap-t>
@@ -60,6 +65,7 @@
     </texture>
 	<texture n="14">
       <image>Textures.high/Terrain/grain_texture.png</image>
+	  <type>2d</type>
       <filter>linear-mipmap-linear</filter>
       <wrap-s>repeat</wrap-s>
       <wrap-t>repeat</wrap-t>
@@ -67,6 +73,7 @@
     </texture>
 	<texture n="15">
       <image>Textures/Terrain/void.png</image>
+	  <type>2d</type>
       <filter>linear-mipmap-linear</filter>
       <wrap-s>repeat</wrap-s>
       <wrap-t>repeat</wrap-t>
@@ -185,6 +192,7 @@
       <texture-unit>
         <unit>0</unit>
         <image><use>texture[0]/image</use></image>
+		<type><use>texture[0]/type</use></type>
         <filter><use>texture[0]/filter</use></filter>
         <wrap-s><use>texture[0]/wrap-s</use></wrap-s>
         <wrap-t><use>texture[0]/wrap-t</use></wrap-t>
@@ -193,6 +201,7 @@
 	<texture-unit>
         <unit>2</unit>
         <image><use>texture[13]/image</use></image>
+		<type><use>texture[13]/type</use></type>
         <filter><use>texture[13]/filter</use></filter>
         <wrap-s><use>texture[13]/wrap-s</use></wrap-s>
         <wrap-t><use>texture[13]/wrap-t</use></wrap-t>
@@ -200,6 +209,7 @@
       </texture-unit>
 	<texture-unit>
         <unit>3</unit>
+		<type><use>texture[15]/type</use></type>
         <image><use>texture[15]/image</use></image>
         <filter><use>texture[15]/filter</use></filter>
         <wrap-s><use>texture[15]/wrap-s</use></wrap-s>
@@ -208,6 +218,7 @@
       </texture-unit>
 	  <texture-unit>
         <unit>4</unit>
+		<type><use>texture[14]/type</use></type>
         <image><use>texture[14]/image</use></image>
         <filter><use>texture[14]/filter</use></filter>
         <wrap-s><use>texture[14]/wrap-s</use></wrap-s>
@@ -216,6 +227,7 @@
       </texture-unit>
       <texture-unit>
         <unit>5</unit>
+		<type><use>texture[12]/type</use></type>
         <image><use>texture[12]/image</use></image>
         <filter><use>texture[12]/filter</use></filter>
         <wrap-s><use>texture[12]/wrap-s</use></wrap-s>
@@ -224,6 +236,7 @@
       </texture-unit>
       <texture-unit>
         <unit>7</unit>
+		<type><use>texture[11]/type</use></type>
         <image><use>texture[11]/image</use></image>
         <filter><use>texture[11]/filter</use></filter>
         <wrap-s><use>texture[11]/wrap-s</use></wrap-s>
@@ -515,6 +528,7 @@
       </render-bin>
       <texture-unit>
         <unit>0</unit>
+		<type><use>texture[0]/type</use></type>
         <image><use>texture[0]/image</use></image>
         <filter><use>texture[0]/filter</use></filter>
         <wrap-s><use>texture[0]/wrap-s</use></wrap-s>
@@ -527,6 +541,7 @@
       </texture-unit>
       <texture-unit>
         <unit>5</unit>
+		<type><use>texture[12]/type</use></type>
         <image><use>texture[12]/image</use></image>
         <filter><use>texture[12]/filter</use></filter>
         <wrap-s><use>texture[12]/wrap-s</use></wrap-s>
@@ -535,6 +550,7 @@
       </texture-unit>
       <texture-unit>
         <unit>6</unit>
+		<type><use>texture[10]/type</use></type>
         <image><use>texture[10]/image</use></image>
         <filter><use>texture[10]/filter</use></filter>
         <wrap-s><use>texture[10]/wrap-s</use></wrap-s>
@@ -543,6 +559,7 @@
       </texture-unit>
       <texture-unit>
         <unit>7</unit>
+		<type><use>texture[11]/type</use></type>
         <image><use>texture[11]/image</use></image>
         <filter><use>texture[11]/filter</use></filter>
         <wrap-s><use>texture[11]/wrap-s</use></wrap-s>
@@ -737,6 +754,7 @@
       </render-bin>
       <texture-unit>
         <unit>0</unit>
+		<type><use>texture[0]/type</use></type>
         <image><use>texture[0]/image</use></image>
         <filter><use>texture[0]/filter</use></filter>
         <wrap-s><use>texture[0]/wrap-s</use></wrap-s>
@@ -896,6 +914,7 @@
       </render-bin>
       <texture-unit>
         <unit>0</unit>
+		<type><use>texture[0]/type</use></type>
         <image><use>texture[0]/image</use></image>
         <filter><use>texture[0]/filter</use></filter>
         <wrap-s><use>texture[0]/wrap-s</use></wrap-s>
@@ -961,6 +980,7 @@
       </render-bin>
       <texture-unit>
         <unit>0</unit>
+		<type><use>texture[0]/type</use></type>
         <image><use>texture[0]/image</use></image>
         <filter><use>texture[0]/filter</use></filter>
         <wrap-s><use>texture[0]/wrap-s</use></wrap-s>
@@ -1000,6 +1020,7 @@
       </render-bin>
       <texture-unit>
         <unit>0</unit>
+		<type><use>texture[0]/type</use></type>
         <image><use>texture[0]/image</use></image>
         <filter><use>texture[0]/filter</use></filter>
         <wrap-s><use>texture[0]/wrap-s</use></wrap-s>
@@ -1080,6 +1101,7 @@
       </render-bin>
       <texture-unit>
         <unit>0</unit>
+		<type><use>texture[0]/type</use></type>
         <image><use>texture[0]/image</use></image>
         <filter><use>texture[0]/filter</use></filter>
         <wrap-s><use>texture[0]/wrap-s</use></wrap-s>
diff --git a/Effects/transition-base-dirt.eff b/Effects/transition-base-dirt.eff
index e66f8c2c4..b6f0a68ae 100644
--- a/Effects/transition-base-dirt.eff
+++ b/Effects/transition-base-dirt.eff
@@ -5,6 +5,7 @@
     <parameters>
 		<texture n="3">
 		    <image>Textures.high/Terrain/dirt3.dds</image>
+			<type>2d</type>
 		    <filter>linear-mipmap-linear</filter>
 		    <wrap-s>repeat</wrap-s>
 		    <wrap-t>repeat</wrap-t>
diff --git a/Effects/transition-base-grass-inverse.eff b/Effects/transition-base-grass-inverse.eff
index 0e2005d3b..42c508f6d 100644
--- a/Effects/transition-base-grass-inverse.eff
+++ b/Effects/transition-base-grass-inverse.eff
@@ -5,6 +5,7 @@
     <parameters>
 		<texture n="3">
 		    <image>Textures.high/Terrain/herbtundra.dds</image>
+			<type>2d</type>
 		    <filter>linear-mipmap-linear</filter>
 		    <wrap-s>repeat</wrap-s>
 		    <wrap-t>repeat</wrap-t>
diff --git a/Effects/transition-base-grass-rock.eff b/Effects/transition-base-grass-rock.eff
index e9e1192ac..4b9a75cae 100644
--- a/Effects/transition-base-grass-rock.eff
+++ b/Effects/transition-base-grass-rock.eff
@@ -5,6 +5,7 @@
     <parameters>
 		<texture n="2">
 		    <image>Textures.high/Terrain/grass10c.dds</image>
+			<type>2d</type>
 		    <filter>linear-mipmap-linear</filter>
 		    <wrap-s>repeat</wrap-s>
 		    <wrap-t>repeat</wrap-t>
@@ -12,6 +13,7 @@
 		</texture>
 		<texture n="3">
 		    <image>Textures.high/Terrain/rock7.dds</image>
+			<type>2d</type>
 		    <filter>linear-mipmap-linear</filter>
 		    <wrap-s>repeat</wrap-s>
 		    <wrap-t>repeat</wrap-t>
@@ -19,6 +21,7 @@
 		</texture>
 		<texture n="4">
 		    <image>Textures.high/Terrain.winter/mixedforest1c.dds</image>
+			<type>2d</type>
 		    <filter>linear-mipmap-linear</filter>
 		    <wrap-s>repeat</wrap-s>
 		    <wrap-t>repeat</wrap-t>
diff --git a/Effects/transition-base-rock.eff b/Effects/transition-base-rock.eff
index 87de290e5..a39c9014c 100644
--- a/Effects/transition-base-rock.eff
+++ b/Effects/transition-base-rock.eff
@@ -5,6 +5,7 @@
     <parameters>
 		<texture n="3">
 		    <image>Textures.high/Terrain/rock7.dds</image>
+			<type>2d</type>
 		    <filter>linear-mipmap-linear</filter>
 		    <wrap-s>repeat</wrap-s>
 		    <wrap-t>repeat</wrap-t>
diff --git a/Effects/transition.eff b/Effects/transition.eff
index f235f3e0a..1df2c6452 100644
--- a/Effects/transition.eff
+++ b/Effects/transition.eff
@@ -17,6 +17,7 @@ parameters :
 	<parameters>
 		<texture n="2">
 			<image>Textures.high/Terrain/transition1.dds</image>
+			<type>2d</type>
 			<filter>linear-mipmap-linear</filter>
 			<wrap-s>repeat</wrap-s>
 			<wrap-t>repeat</wrap-t>
@@ -24,6 +25,7 @@ parameters :
 		</texture>
 		<texture n="3">
 			<image>Textures.high/Terrain/transition2.dds</image>
+			<type>2d</type>
 			<filter>linear-mipmap-linear</filter>
 			<wrap-s>repeat</wrap-s>
 			<wrap-t>repeat</wrap-t>
@@ -31,6 +33,7 @@ parameters :
 		</texture>
 		<texture n="4">
 			<image>Textures.high/Terrain/snow3.dds</image>
+			<type>2d</type>
 			<filter>linear-mipmap-linear</filter>
 			<wrap-s>repeat</wrap-s>
 			<wrap-t>repeat</wrap-t>
@@ -149,6 +152,9 @@ parameters :
 
 			<texture-unit>
 				<unit>0</unit>
+				<type>
+					<use>texture[0]/type</use>
+				</type>
 				<image>
 					<use>texture[0]/image</use>
 				</image>
@@ -168,6 +174,9 @@ parameters :
 
 			<texture-unit>
 				<unit>1</unit>
+				<type>
+					<use>texture[2]/type</use>
+				</type>
 				<image>
 					<use>texture[2]/image</use>
 				</image>
@@ -187,6 +196,9 @@ parameters :
 
 			<texture-unit>
 				<unit>2</unit>
+				<type>
+					<use>texture[3]/type</use>
+				</type>
 				<image>
 					<use>texture[3]/image</use>
 				</image>
@@ -206,6 +218,9 @@ parameters :
 
 			<texture-unit>
 				<unit>3</unit>
+				<type>
+					<use>texture[4]/type</use>
+				</type>
 				<image>
 					<use>texture[4]/image</use>
 				</image>
@@ -449,6 +464,9 @@ parameters :
 
 			<texture-unit>
 				<unit>0</unit>
+				<type>
+					<use>texture[0]/type</use>
+				</type>
 				<image>
 					<use>texture[0]/image</use>
 				</image>
@@ -468,6 +486,9 @@ parameters :
 
 			<texture-unit>
 				<unit>1</unit>
+				<type>
+					<use>texture[2]/type</use>
+				</type>
 				<image>
 					<use>texture[2]/image</use>
 				</image>
@@ -487,6 +508,9 @@ parameters :
 
 			<texture-unit>
 				<unit>2</unit>
+				<type>
+					<use>texture[3]/type</use>
+				</type>
 				<image>
 					<use>texture[3]/image</use>
 				</image>
@@ -506,6 +530,9 @@ parameters :
 
 			<texture-unit>
 				<unit>3</unit>
+				<type>
+					<use>texture[4]/type</use>
+				</type>
 				<image>
 					<use>texture[4]/image</use>
 				</image>
diff --git a/Effects/urban.eff b/Effects/urban.eff
index c387d77c6..44aa1156e 100644
--- a/Effects/urban.eff
+++ b/Effects/urban.eff
@@ -110,6 +110,9 @@
 				<image>
 					<use>texture[0]/image</use>
 				</image>
+				<type>
+					<use>texture[0]/type</use>
+				</type>
 				<filter>
 					<use>texture[0]/filter</use>
 				</filter>
@@ -128,6 +131,9 @@
 				<image>
 					<use>texture[2]/image</use>
 				</image>
+				<type>
+					<use>texture[2]/type</use>
+				</type>
 				<filter>
 					<use>texture[2]/filter</use>
 				</filter>
@@ -146,6 +152,9 @@
 				<image>
 					<use>texture[2]/image</use>
 				</image>
+				<type>
+					<use>texture[2]/type</use>
+				</type>
 				<filter>nearest-mipmap-nearest</filter>
 				<wrap-s>
 					<use>texture[2]/wrap-s</use>
@@ -401,6 +410,9 @@
 				<image>
 					<use>texture[0]/image</use>
 				</image>
+				<type>
+					<use>texture[0]/type</use>
+				</type>
 				<filter>
 					<use>texture[0]/filter</use>
 				</filter>
@@ -419,6 +431,9 @@
 				<image>
 					<use>texture[2]/image</use>
 				</image>
+				<type>
+					<use>texture[2]/type</use>
+				</type>
 				<filter>
 					<use>texture[2]/filter</use>
 				</filter>
@@ -659,6 +674,9 @@
 				<image>
 					<use>texture[0]/image</use>
 				</image>
+				<type>
+					<use>texture[0]/type</use>
+				</type>
 				<filter>
 					<use>texture[0]/filter</use>
 				</filter>
@@ -677,6 +695,9 @@
 				<image>
 					<use>texture[2]/image</use>
 				</image>
+				<type>
+					<use>texture[2]/type</use>
+				</type>
 				<filter>
 					<use>texture[2]/filter</use>
 				</filter>
@@ -695,6 +716,9 @@
 				<image>
 					<use>texture[2]/image</use>
 				</image>
+				<type>
+					<use>texture[2]/type</use>
+				</type>
 				<filter>nearest-mipmap-nearest</filter>
 				<wrap-s>
 					<use>texture[2]/wrap-s</use>
@@ -846,6 +870,9 @@
 				<image>
 					<use>texture[0]/image</use>
 				</image>
+				<type>
+					<use>texture[0]/type</use>
+				</type>
 				<filter>
 					<use>texture[0]/filter</use>
 				</filter>
@@ -864,6 +891,9 @@
 				<image>
 					<use>texture[2]/image</use>
 				</image>
+				<type>
+					<use>texture[2]/type</use>
+				</type>
 				<filter>
 					<use>texture[2]/filter</use>
 				</filter>
@@ -1018,6 +1048,9 @@
 				<image>
 					<use>texture[0]/image</use>
 				</image>
+				<type>
+					<use>texture[0]/type</use>
+				</type>
 				<filter>
 					<use>texture[0]/filter</use>
 				</filter>
@@ -1036,6 +1069,9 @@
 				<image>
 					<use>texture[2]/image</use>
 				</image>
+				<type>
+					<use>texture[2]/type</use>
+				</type>
 				<filter>
 					<use>texture[2]/filter</use>
 				</filter>
@@ -1054,6 +1090,9 @@
 				<image>
 					<use>texture[2]/image</use>
 				</image>
+				<type>
+					<use>texture[2]/type</use>
+				</type>
 				<filter>nearest-mipmap-nearest</filter>
 				<wrap-s>
 					<use>texture[2]/wrap-s</use>
@@ -1264,6 +1303,9 @@
 				<image>
 					<use>texture[0]/image</use>
 				</image>
+				<type>
+					<use>texture[0]/type</use>
+				</type>
 				<filter>
 					<use>texture[0]/filter</use>
 				</filter>
@@ -1282,6 +1324,9 @@
 				<image>
 					<use>texture[2]/image</use>
 				</image>
+				<type>
+					<use>texture[2]/type</use>
+				</type>
 				<filter>
 					<use>texture[2]/filter</use>
 				</filter>
diff --git a/Effects/water-dds.eff b/Effects/water-dds.eff
index 90c59d8b9..e3f09b50d 100644
--- a/Effects/water-dds.eff
+++ b/Effects/water-dds.eff
@@ -5,6 +5,7 @@
 	<parameters>
 		<texture n="0">
 			<image>Textures/Water/water-reflection.dds</image>
+			<type>2d</type>
 			<filter>linear-mipmap-linear</filter>
 			<wrap-s>repeat</wrap-s>
 			<wrap-t>repeat</wrap-t>
@@ -12,6 +13,7 @@
 		</texture>
 		<texture n="2">
 			<image>Textures/Water/waves-ver10-nm.dds</image>
+			<type>2d</type>
 			<filter>linear-mipmap-linear</filter>
 			<wrap-s>repeat</wrap-s>
 			<wrap-t>repeat</wrap-t>
@@ -19,6 +21,7 @@
 		</texture>
 		<texture n="3">
 			<image>Textures/Water/water_sine_nmap.dds</image>
+			<type>2d</type>
 			<filter>linear-mipmap-linear</filter>
 			<wrap-s>repeat</wrap-s>
 			<wrap-t>repeat</wrap-t>
@@ -26,6 +29,7 @@
 		</texture>
 		<texture n="4">
 			<image>Textures/Water/water-reflection-grey.dds</image>
+			<type>2d</type>
 			<filter>linear-mipmap-linear</filter>
 			<wrap-s>repeat</wrap-s>
 			<wrap-t>repeat</wrap-t>
@@ -33,6 +37,7 @@
 		</texture>
 		<texture n="5">
 			<image>Textures/Water/sea_foam.dds</image>
+			<type>2d</type>
 			<filter>linear-mipmap-linear</filter>
 			<wrap-s>repeat</wrap-s>
 			<wrap-t>repeat</wrap-t>
@@ -40,6 +45,7 @@
 		</texture>
 		<texture n="6">
 			<image>Textures/Water/perlin-noise-nm.dds</image>
+			<type>2d</type>
 			<filter>linear-mipmap-linear</filter>
 			<wrap-s>repeat</wrap-s>
 			<wrap-t>repeat</wrap-t>
diff --git a/Effects/water-inland.eff b/Effects/water-inland.eff
index fa49487f7..dcb917e79 100644
--- a/Effects/water-inland.eff
+++ b/Effects/water-inland.eff
@@ -5,6 +5,7 @@
 	<parameters>
 		<texture n="0">
 			<image>Textures/Water/water-reflection.png</image>
+			<type>2d</type>
 			<filter>linear-mipmap-linear</filter>
 			<wrap-s>repeat</wrap-s>
 			<wrap-t>repeat</wrap-t>
@@ -12,6 +13,7 @@
 		</texture>
 		<texture n="2">
 			<image>Textures/Water/waves-ver10-nm.png</image>
+			<type>2d</type>
 			<filter>linear-mipmap-linear</filter>
 			<wrap-s>repeat</wrap-s>
 			<wrap-t>repeat</wrap-t>
@@ -19,6 +21,7 @@
 		</texture>
 		<texture n="3">
 			<image>Textures/Water/water_sine_nmap.png</image>
+			<type>2d</type>
 			<filter>linear-mipmap-linear</filter>
 			<wrap-s>repeat</wrap-s>
 			<wrap-t>repeat</wrap-t>
@@ -26,6 +29,7 @@
 		</texture>
 		<texture n="4">
 			<image>Textures/Water/water-reflection-grey.png</image>
+			<type>2d</type>
 			<filter>linear-mipmap-linear</filter>
 			<wrap-s>repeat</wrap-s>
 			<wrap-t>repeat</wrap-t>
@@ -33,6 +37,7 @@
 		</texture>
 		<texture n="5">
 			<image>Textures/Water/sea_foam.png</image>
+			<type>2d</type>
 			<filter>linear-mipmap-linear</filter>
 			<wrap-s>repeat</wrap-s>
 			<wrap-t>repeat</wrap-t>
@@ -40,6 +45,7 @@
 		</texture>
 		<texture n="6">
 			<image>Textures/Water/perlin-noise-nm.png</image>
+			<type>2d</type>
 			<filter>linear-mipmap-linear</filter>
 			<wrap-s>repeat</wrap-s>
 			<wrap-t>repeat</wrap-t>
@@ -209,6 +215,9 @@
 				<image>
 					<use>texture[0]/image</use>
 				</image>
+				<type>
+					<use>texture[0]/type</use>
+				</type>
 				<filter>
 					<use>texture[0]/filter</use>
 				</filter>
@@ -227,6 +236,9 @@
 				<image>
 					<use>texture[2]/image</use>
 				</image>
+				<type>
+					<use>texture[2]/type</use>
+				</type>
 				<filter>
 					<use>texture[2]/filter</use>
 				</filter>
@@ -245,6 +257,9 @@
 				<image>
 					<use>texture[3]/image</use>
 				</image>
+				<type>
+					<use>texture[3]/type</use>
+				</type>
 				<filter>
 					<use>texture[3]/filter</use>
 				</filter>
@@ -263,6 +278,9 @@
 				<image>
 					<use>texture[4]/image</use>
 				</image>
+				<type>
+					<use>texture[4]/type</use>
+				</type>
 				<filter>
 					<use>texture[4]/filter</use>
 				</filter>
@@ -281,6 +299,9 @@
 				<image>
 					<use>texture[5]/image</use>
 				</image>
+				<type>
+					<use>texture[5]/type</use>
+				</type>
 				<filter>
 					<use>texture[5]/filter</use>
 				</filter>
@@ -299,6 +320,9 @@
 				<image>
 					<use>texture[6]/image</use>
 				</image>
+				<type>
+					<use>texture[6]/type</use>
+				</type>
 				<filter>
 					<use>texture[6]/filter</use>
 				</filter>
@@ -576,6 +600,9 @@
 				<image>
 					<use>texture[0]/image</use>
 				</image>
+				<type>
+					<use>texture[0]/type</use>
+				</type>
 				<filter>
 					<use>texture[0]/filter</use>
 				</filter>
@@ -594,6 +621,9 @@
 				<image>
 					<use>texture[2]/image</use>
 				</image>
+				<type>
+					<use>texture[2]/type</use>
+				</type>
 				<filter>
 					<use>texture[2]/filter</use>
 				</filter>
@@ -612,6 +642,9 @@
 				<image>
 					<use>texture[3]/image</use>
 				</image>
+				<type>
+					<use>texture[3]/type</use>
+				</type>
 				<filter>
 					<use>texture[3]/filter</use>
 				</filter>
@@ -630,6 +663,9 @@
 				<image>
 					<use>texture[4]/image</use>
 				</image>
+				<type>
+					<use>texture[4]/type</use>
+				</type>
 				<filter>
 					<use>texture[4]/filter</use>
 				</filter>
@@ -648,6 +684,9 @@
 				<image>
 					<use>texture[5]/image</use>
 				</image>
+				<type>
+					<use>texture[5]/type</use>
+				</type>
 				<filter>
 					<use>texture[5]/filter</use>
 				</filter>
@@ -666,6 +705,9 @@
 				<image>
 					<use>texture[6]/image</use>
 				</image>
+				<type>
+					<use>texture[6]/type</use>
+				</type>
 				<filter>
 					<use>texture[6]/filter</use>
 				</filter>
@@ -949,6 +991,9 @@
 				<image>
 					<use>texture[0]/image</use>
 				</image>
+				<type>
+					<use>texture[0]/type</use>
+				</type>
 				<filter>
 					<use>texture[0]/filter</use>
 				</filter>
@@ -967,6 +1012,9 @@
 				<image>
 					<use>texture[2]/image</use>
 				</image>
+				<type>
+					<use>texture[2]/type</use>
+				</type>
 				<filter>
 					<use>texture[2]/filter</use>
 				</filter>
@@ -985,6 +1033,9 @@
 				<image>
 					<use>texture[3]/image</use>
 				</image>
+				<type>
+					<use>texture[3]/type</use>
+				</type>
 				<filter>
 					<use>texture[3]/filter</use>
 				</filter>
@@ -1003,6 +1054,9 @@
 				<image>
 					<use>texture[4]/image</use>
 				</image>
+				<type>
+					<use>texture[4]/type</use>
+				</type>
 				<filter>
 					<use>texture[4]/filter</use>
 				</filter>
@@ -1021,6 +1075,9 @@
 				<image>
 					<use>texture[5]/image</use>
 				</image>
+				<type>
+					<use>texture[5]/type</use>
+				</type>
 				<filter>
 					<use>texture[5]/filter</use>
 				</filter>
@@ -1039,6 +1096,9 @@
 				<image>
 					<use>texture[6]/image</use>
 				</image>
+				<type>
+					<use>texture[6]/type</use>
+				</type>
 				<filter>
 					<use>texture[6]/filter</use>
 				</filter>
@@ -1314,6 +1374,9 @@
 				<image>
 					<use>texture[0]/image</use>
 				</image>
+				<type>
+					<use>texture[0]/type</use>
+				</type>
 				<filter>
 					<use>texture[0]/filter</use>
 				</filter>
@@ -1332,6 +1395,9 @@
 				<image>
 					<use>texture[2]/image</use>
 				</image>
+				<type>
+					<use>texture[2]/type</use>
+				</type>
 				<filter>
 					<use>texture[2]/filter</use>
 				</filter>
@@ -1350,6 +1416,9 @@
 				<image>
 					<use>texture[3]/image</use>
 				</image>
+				<type>
+					<use>texture[3]/type</use>
+				</type>
 				<filter>
 					<use>texture[3]/filter</use>
 				</filter>
@@ -1368,6 +1437,9 @@
 				<image>
 					<use>texture[4]/image</use>
 				</image>
+				<type>
+					<use>texture[4]/type</use>
+				</type>
 				<filter>
 					<use>texture[4]/filter</use>
 				</filter>
@@ -1386,6 +1458,9 @@
 				<image>
 					<use>texture[5]/image</use>
 				</image>
+				<type>
+					<use>texture[5]/type</use>
+				</type>
 				<filter>
 					<use>texture[5]/filter</use>
 				</filter>
@@ -1404,6 +1479,9 @@
 				<image>
 					<use>texture[6]/image</use>
 				</image>
+				<type>
+					<use>texture[6]/type</use>
+				</type>
 				<filter>
 					<use>texture[6]/filter</use>
 				</filter>
diff --git a/Effects/water.eff b/Effects/water.eff
index 9fbde5cb6..88bacb034 100644
--- a/Effects/water.eff
+++ b/Effects/water.eff
@@ -5,6 +5,7 @@
 	<parameters>
 		<texture n="0">
 			<image>Textures/Water/water-reflection.png</image>
+			<type>2d</type>
 			<filter>linear-mipmap-linear</filter>
 			<wrap-s>repeat</wrap-s>
 			<wrap-t>repeat</wrap-t>
@@ -12,6 +13,7 @@
 		</texture>
 		<texture n="2">
 			<image>Textures/Water/waves-ver10-nm.png</image>
+			<type>2d</type>
 			<filter>linear-mipmap-linear</filter>
 			<wrap-s>repeat</wrap-s>
 			<wrap-t>repeat</wrap-t>
@@ -19,6 +21,7 @@
 		</texture>
 		<texture n="3">
 			<image>Textures/Water/water_sine_nmap.png</image>
+			<type>2d</type>
 			<filter>linear-mipmap-linear</filter>
 			<wrap-s>repeat</wrap-s>
 			<wrap-t>repeat</wrap-t>
@@ -26,6 +29,7 @@
 		</texture>
 		<texture n="4">
 			<image>Textures/Water/water-reflection-grey.png</image>
+			<type>2d</type>
 			<filter>linear-mipmap-linear</filter>
 			<wrap-s>repeat</wrap-s>
 			<wrap-t>repeat</wrap-t>
@@ -33,6 +37,7 @@
 		</texture>
 		<texture n="5">
 			<image>Textures/Water/sea_foam.png</image>
+			<type>2d</type>
 			<filter>linear-mipmap-linear</filter>
 			<wrap-s>repeat</wrap-s>
 			<wrap-t>repeat</wrap-t>
@@ -40,6 +45,7 @@
 		</texture>
 		<texture n="6">
 			<image>Textures/Water/perlin-noise-nm.png</image>
+			<type>2d</type>
 			<filter>linear-mipmap-linear</filter>
 			<wrap-s>repeat</wrap-s>
 			<wrap-t>repeat</wrap-t>
@@ -47,6 +53,7 @@
 		</texture>
 		<texture n="7">
 			<image>Textures/Globe/ocean_depth_1.png</image>
+			<type>2d</type>
 			<filter>linear-mipmap-linear</filter>
 			<wrap-s>repeat</wrap-s>
 			<wrap-t>repeat</wrap-t>
@@ -54,6 +61,7 @@
 		</texture>
 		<texture n="10">
 			<image>Textures.high/Terrain/packice-overlay.png</image>
+			<type>2d</type>
 			<filter>linear-mipmap-linear</filter>
 			<wrap-s>repeat</wrap-s>
 			<wrap-t>repeat</wrap-t>
@@ -232,6 +240,9 @@
 				<image>
 					<use>texture[0]/image</use>
 				</image>
+				<type>
+					<use>texture[0]/type</use>
+				</type>
 				<filter>
 					<use>texture[0]/filter</use>
 				</filter>
@@ -250,6 +261,9 @@
 				<image>
 					<use>texture[2]/image</use>
 				</image>
+				<type>
+					<use>texture[2]/type</use>
+				</type>
 				<filter>
 					<use>texture[2]/filter</use>
 				</filter>
@@ -268,6 +282,9 @@
 				<image>
 					<use>texture[3]/image</use>
 				</image>
+				<type>
+					<use>texture[3]/type</use>
+				</type>
 				<filter>
 					<use>texture[3]/filter</use>
 				</filter>
@@ -286,6 +303,9 @@
 				<image>
 					<use>texture[4]/image</use>
 				</image>
+				<type>
+					<use>texture[4]/type</use>
+				</type>
 				<filter>
 					<use>texture[4]/filter</use>
 				</filter>
@@ -304,6 +324,9 @@
 				<image>
 					<use>texture[5]/image</use>
 				</image>
+				<type>
+					<use>texture[5]/type</use>
+				</type>
 				<filter>
 					<use>texture[5]/filter</use>
 				</filter>
@@ -322,6 +345,9 @@
 				<image>
 					<use>texture[6]/image</use>
 				</image>
+				<type>
+					<use>texture[6]/type</use>
+				</type>
 				<filter>
 					<use>texture[6]/filter</use>
 				</filter>
@@ -340,6 +366,9 @@
 				<image>
 					<use>texture[10]/image</use>
 				</image>
+				<type>
+					<use>texture[10]/type</use>
+				</type>
 				<filter>
 					<use>texture[10]/filter</use>
 				</filter>
@@ -578,8 +607,6 @@
 		</pass>
 	</technique>
 
-
-
 <technique n="2">
 		<predicate>
 			<and>
@@ -638,6 +665,9 @@
 				<image>
 					<use>texture[0]/image</use>
 				</image>
+				<type>
+					<use>texture[0]/type</use>
+				</type>
 				<filter>
 					<use>texture[0]/filter</use>
 				</filter>
@@ -656,6 +686,9 @@
 				<image>
 					<use>texture[2]/image</use>
 				</image>
+				<type>
+					<use>texture[2]/type</use>
+				</type>
 				<filter>
 					<use>texture[2]/filter</use>
 				</filter>
@@ -674,6 +707,9 @@
 				<image>
 					<use>texture[3]/image</use>
 				</image>
+				<type>
+					<use>texture[3]/type</use>
+				</type>
 				<filter>
 					<use>texture[3]/filter</use>
 				</filter>
@@ -692,6 +728,9 @@
 				<image>
 					<use>texture[4]/image</use>
 				</image>
+				<type>
+					<use>texture[4]/type</use>
+				</type>
 				<filter>
 					<use>texture[4]/filter</use>
 				</filter>
@@ -710,6 +749,9 @@
 				<image>
 					<use>texture[5]/image</use>
 				</image>
+				<type>
+					<use>texture[5]/type</use>
+				</type>
 				<filter>
 					<use>texture[5]/filter</use>
 				</filter>
@@ -728,6 +770,9 @@
 				<image>
 					<use>texture[6]/image</use>
 				</image>
+				<type>
+					<use>texture[6]/type</use>
+				</type>
 				<filter>
 					<use>texture[6]/filter</use>
 				</filter>
@@ -946,9 +991,6 @@
 		</pass>
 	</technique>
 	
-
-
-
    <technique n="6">
        <predicate>
            <and>
@@ -1014,6 +1056,9 @@
                <image>
                    <use>texture[0]/image</use>
                </image>
+			   <type>
+				   <use>texture[0]/type</use>
+			   </type>
                <filter>
                    <use>texture[0]/filter</use>
                </filter>
@@ -1036,6 +1081,9 @@
                <image>
                    <use>texture[2]/image</use>
                </image>
+			   <type>
+				   <use>texture[2]/type</use>
+			   </type>
                <filter>
                    <use>texture[2]/filter</use>
                </filter>
@@ -1054,6 +1102,9 @@
                <image>
                    <use>texture[3]/image</use>
                </image>
+			   <type>
+				   <use>texture[3]/type</use>
+			   </type>
                <filter>
                    <use>texture[3]/filter</use>
                </filter>
@@ -1072,6 +1123,9 @@
                <image>
                    <use>texture[4]/image</use>
                </image>
+			   <type>
+				   <use>texture[4]/type</use>
+			   </type>
                <filter>
                    <use>texture[4]/filter</use>
                </filter>
@@ -1090,6 +1144,9 @@
                <image>
                    <use>texture[5]/image</use>
                </image>
+			   <type>
+				   <use>texture[5]/type</use>
+			   </type>
                <filter>
                    <use>texture[5]/filter</use>
                </filter>
@@ -1108,6 +1165,9 @@
                <image>
                    <use>texture[6]/image</use>
                </image>
+			   <type>
+				   <use>texture[6]/type</use>
+			   </type>
                <filter>
                    <use>texture[6]/filter</use>
                </filter>
@@ -1126,6 +1186,9 @@
                 <image>
                     <use>texture[7]/image</use>
                 </image>
+				<type>
+					<use>texture[7]/type</use>
+				</type>
                 <filter>
                     <use>texture[7]/filter</use>
                 </filter>
@@ -1370,6 +1433,7 @@
                </uniform>
                </pass>
            </technique>
+
            <technique n="7">
                <predicate>
                    <and>
@@ -1433,6 +1497,9 @@
                        <image>
                            <use>texture[0]/image</use>
                        </image>
+					   <type>
+						   <use>texture[0]/type</use>
+					   </type>
                        <filter>
                            <use>texture[0]/filter</use>
                        </filter>
@@ -1451,6 +1518,9 @@
                        <image>
                            <use>texture[2]/image</use>
                        </image>
+					   <type>
+						   <use>texture[2]/type</use>
+					   </type>
                        <filter>
                            <use>texture[2]/filter</use>
                        </filter>
@@ -1469,6 +1539,9 @@
                        <image>
                            <use>texture[3]/image</use>
                        </image>
+					   <type>
+						   <use>texture[3]/type</use>
+					   </type>
                        <filter>
                            <use>texture[3]/filter</use>
                        </filter>
@@ -1487,6 +1560,9 @@
                        <image>
                            <use>texture[4]/image</use>
                        </image>
+					   <type>
+						   <use>texture[4]/type</use>
+					   </type>
                        <filter>
                            <use>texture[4]/filter</use>
                        </filter>
@@ -1505,6 +1581,9 @@
                        <image>
                            <use>texture[5]/image</use>
                        </image>
+					   <type>
+						   <use>texture[5]/type</use>
+					   </type>
                        <filter>
                            <use>texture[5]/filter</use>
                        </filter>
@@ -1523,6 +1602,9 @@
                        <image>
                            <use>texture[6]/image</use>
                        </image>
+					   <type>
+						   <use>texture[6]/type</use>
+					   </type>
                        <filter>
                            <use>texture[6]/filter</use>
                        </filter>
@@ -1815,6 +1897,9 @@
 				<image>
 					<use>texture[0]/image</use>
 				</image>
+				<type>
+					<use>texture[0]/type</use>
+				</type>
 				<filter>
 					<use>texture[0]/filter</use>
 				</filter>
@@ -1837,6 +1922,9 @@
 				<image>
 					<use>texture[2]/image</use>
 				</image>
+				<type>
+					<use>texture[2]/type</use>
+				</type>
 				<filter>
 					<use>texture[2]/filter</use>
 				</filter>
@@ -1855,6 +1943,9 @@
 				<image>
 					<use>texture[3]/image</use>
 				</image>
+				<type>
+					<use>texture[3]/type</use>
+				</type>
 				<filter>
 					<use>texture[3]/filter</use>
 				</filter>
@@ -1873,6 +1964,9 @@
 				<image>
 					<use>texture[4]/image</use>
 				</image>
+				<type>
+					<use>texture[4]/type</use>
+				</type>
 				<filter>
 					<use>texture[4]/filter</use>
 				</filter>
@@ -1891,6 +1985,9 @@
 				<image>
 					<use>texture[5]/image</use>
 				</image>
+				<type>
+					<use>texture[5]/type</use>
+				</type>
 				<filter>
 					<use>texture[5]/filter</use>
 				</filter>
@@ -1909,6 +2006,9 @@
 				<image>
 					<use>texture[6]/image</use>
 				</image>
+				<type>
+					<use>texture[6]/type</use>
+				</type>
 				<filter>
 					<use>texture[6]/filter</use>
 				</filter>
@@ -1927,6 +2027,9 @@
 				<image>
 					<use>texture[7]/image</use>
 				</image>
+				<type>
+					<use>texture[7]/type</use>
+				</type>
 				<filter>
 					<use>texture[7]/filter</use>
 				</filter>
@@ -2176,6 +2279,7 @@
             </uniform>
 		</pass>
 	</technique>
+
 	<technique n="9">
 		<predicate>
 			<and>
@@ -2234,6 +2338,9 @@
 				<image>
 					<use>texture[0]/image</use>
 				</image>
+				<type>
+					<use>texture[0]/type</use>
+				</type>
 				<filter>
 					<use>texture[0]/filter</use>
 				</filter>
@@ -2252,6 +2359,9 @@
 				<image>
 					<use>texture[2]/image</use>
 				</image>
+				<type>
+					<use>texture[2]/type</use>
+				</type>
 				<filter>
 					<use>texture[2]/filter</use>
 				</filter>
@@ -2270,6 +2380,9 @@
 				<image>
 					<use>texture[3]/image</use>
 				</image>
+				<type>
+					<use>texture[3]/type</use>
+				</type>
 				<filter>
 					<use>texture[3]/filter</use>
 				</filter>
@@ -2288,6 +2401,9 @@
 				<image>
 					<use>texture[4]/image</use>
 				</image>
+				<type>
+					<use>texture[4]/type</use>
+				</type>
 				<filter>
 					<use>texture[4]/filter</use>
 				</filter>
@@ -2306,6 +2422,9 @@
 				<image>
 					<use>texture[5]/image</use>
 				</image>
+				<type>
+					<use>texture[5]/type</use>
+				</type>
 				<filter>
 					<use>texture[5]/filter</use>
 				</filter>
@@ -2324,6 +2443,9 @@
 				<image>
 					<use>texture[6]/image</use>
 				</image>
+				<type>
+					<use>texture[6]/type</use>
+				</type>
 				<filter>
 					<use>texture[6]/filter</use>
 				</filter>