Merge branch 'master' of shard.imon.nu:Assets

Models/TerrainFiveIstles/Bridges/BaseBridge.mtl

@@ -9,8 +9,8 @@ Ks 0.500000 0.500000 0.500000
 Ni 1.000000
 d 0.000000
 illum 2
-map_Kd Texture.png
+map_Kd BridgeSegment/Texture.png
-map_Bump NM.png
+map_Bump BridgeSegment/NM.png
 
 newmtl Bridge_Bridge_initialShadingGroup4_NONE
 Ns 96.078431
@@ -20,8 +20,8 @@ Ks 0.500000 0.500000 0.500000
 Ni 1.000000
 d 0.000000
 illum 2
-map_Kd Texture.png
+map_Kd BridgeSegment/Texture.png
-map_Bump NM.png
+map_Bump BridgeSegment/NM.png
 
 newmtl Ramp_Ramp_initialShadingGroup2.001
 Ns 96.078431
@@ -31,5 +31,5 @@ Ks 0.500000 0.500000 0.500000
 Ni 1.000000
 d 0.000000
 illum 2
-map_Kd Texture.png
+map_Kd BridgeRamp/Texture.png
-map_Bump NM.png
+map_Bump BridgeRamp/NM.png

Models/Turret/GunRotation/GunRotation.mtl

@@ -1,22 +1,3 @@
-newmtl Wall_initialShadingGroup
-illum 4
-Kd 0.00 0.00 0.00
-Ka 0.00 0.00 0.00
-Tf 1.00 1.00 1.00
-Ni 1.00
-newmtl initialShadingGroup
-illum 4
-Kd 0.00 0.00 0.00
-Ka 0.00 0.00 0.00
-Tf 1.00 1.00 1.00
-map_Kd turretBaseTexture.png
-Ni 1.00
-newmtl lambert2SG
-illum 4
-Kd 0.50 0.50 0.50
-Ka 0.00 0.00 0.00
-Tf 1.00 1.00 1.00
-Ni 1.00
 newmtl lambert3SG
 illum 4
 Kd 0.00 0.00 0.00
@@ -24,10 +5,3 @@ Ka 0.00 0.00 0.00
 Tf 1.00 1.00 1.00
 map_Kd RotatorTexture.png
 Ni 1.00
-newmtl lambert4SG
-illum 4
-Kd 0.00 0.00 0.00
-Ka 0.00 0.00 0.00
-Tf 1.00 1.00 1.00
-map_Kd gunTexture.png
-Ni 1.00