From 8d786d0bcbce3e9d3bfa6d7eeead852052f98b34 Mon Sep 17 00:00:00 2001
From: Stan <stan@wildfiregames.com>
Date: Thu, 17 Feb 2022 18:41:55 +0000
Subject: [PATCH] Fix some unused extra materials in trees and geology reported
 in validator.py.

This was SVN commit r26399.
---
 .../art/actors/flora/trees/pine_black.xml     |  2 +-
 .../actors/flora/trees/pine_black_dead.xml    |  2 +-
 .../art/actors/flora/trees/tree_test_top.xml  | 23 ++++++++-----------
 .../stone_desert_badlands_cubic_weathered.xml |  2 +-
 .../stone_desert_badlands_furrowed.xml        |  2 +-
 .../actors/geology/stone_desert_furrowed.xml  |  2 +-
 .../geology/stone_savanna_cubic_weathered.xml |  2 +-
 .../stone_temperate_cubic_weathered.xml       |  2 +-
 .../geology/stone_tropic_cubic_weathered.xml  |  2 +-
 9 files changed, 17 insertions(+), 22 deletions(-)

diff --git a/binaries/data/mods/public/art/actors/flora/trees/pine_black.xml b/binaries/data/mods/public/art/actors/flora/trees/pine_black.xml
index 93fe26f4f3..5ab9136701 100644
--- a/binaries/data/mods/public/art/actors/flora/trees/pine_black.xml
+++ b/binaries/data/mods/public/art/actors/flora/trees/pine_black.xml
@@ -41,5 +41,5 @@
       <mesh>gaia/pine_black_3_live.dae</mesh>
     </variant>
   </group>
-  <material>basic_trans_wind.xml</material>
+  <material>basic_trans_wind_norm_spec.xml</material>
 </actor>
diff --git a/binaries/data/mods/public/art/actors/flora/trees/pine_black_dead.xml b/binaries/data/mods/public/art/actors/flora/trees/pine_black_dead.xml
index 9670f710bc..97c59d8e68 100644
--- a/binaries/data/mods/public/art/actors/flora/trees/pine_black_dead.xml
+++ b/binaries/data/mods/public/art/actors/flora/trees/pine_black_dead.xml
@@ -21,5 +21,5 @@
       <mesh>gaia/pine_black_3_live.dae</mesh>
     </variant>
   </group>
-  <material>basic_trans_wind.xml</material>
+  <material>basic_trans_wind_norm_spec.xml</material>
 </actor>
diff --git a/binaries/data/mods/public/art/actors/flora/trees/tree_test_top.xml b/binaries/data/mods/public/art/actors/flora/trees/tree_test_top.xml
index c84ff8502d..6f0389d255 100644
--- a/binaries/data/mods/public/art/actors/flora/trees/tree_test_top.xml
+++ b/binaries/data/mods/public/art/actors/flora/trees/tree_test_top.xml
@@ -1,32 +1,27 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 <actor version="1">
-
   <castshadow/>
-
   <group>
     <variant frequency="1" name="tree test top">
       <mesh>gaia/tree_test_top.dae</mesh>
     </variant>
   </group>
-
   <group>
     <variant frequency="1" name="leaf-color-a">
-      <textures><texture file="gaia/tree_carob_a.dds" name="baseTex"/>
-          <texture file="props/yellow.png" name="specTex"/>
-    </textures>
+      <textures>
+        <texture file="gaia/tree_carob_a.dds" name="baseTex"/>
+      </textures>
     </variant>
     <variant frequency="1" name="leaf-color-b">
-      <textures><texture file="gaia/tree_carob_b.dds" name="baseTex"/>
-    <texture file="props/yellow.png" name="specTex"/>
-    </textures>
+      <textures>
+        <texture file="gaia/tree_carob_b.dds" name="baseTex"/>
+      </textures>
     </variant>
     <variant frequency="1" name="leaf-color-c">
-      <textures><texture file="gaia/tree_carob_c.dds" name="baseTex"/>
-    <texture file="props/yellow.png" name="specTex"/>
-    </textures>
+      <textures>
+        <texture file="gaia/tree_carob_c.dds" name="baseTex"/>
+      </textures>
     </variant>
   </group>
-
   <material>basic_trans_wind.xml</material>
-
 </actor>
diff --git a/binaries/data/mods/public/art/actors/geology/stone_desert_badlands_cubic_weathered.xml b/binaries/data/mods/public/art/actors/geology/stone_desert_badlands_cubic_weathered.xml
index a73d1ea690..6f5f0485a9 100644
--- a/binaries/data/mods/public/art/actors/geology/stone_desert_badlands_cubic_weathered.xml
+++ b/binaries/data/mods/public/art/actors/geology/stone_desert_badlands_cubic_weathered.xml
@@ -35,5 +35,5 @@
       </textures>
     </variant>
   </group>
-  <material>player_trans_parallax.xml</material>
+  <material>no_trans_norm_spec.xml</material>
 </actor>
diff --git a/binaries/data/mods/public/art/actors/geology/stone_desert_badlands_furrowed.xml b/binaries/data/mods/public/art/actors/geology/stone_desert_badlands_furrowed.xml
index 32f4a5ea72..e63ad42f76 100644
--- a/binaries/data/mods/public/art/actors/geology/stone_desert_badlands_furrowed.xml
+++ b/binaries/data/mods/public/art/actors/geology/stone_desert_badlands_furrowed.xml
@@ -35,5 +35,5 @@
       </textures>
     </variant>
   </group>
-  <material>player_trans_parallax_spec_helmet.xml</material>
+  <material>no_trans_norm_spec.xml</material>
 </actor>
diff --git a/binaries/data/mods/public/art/actors/geology/stone_desert_furrowed.xml b/binaries/data/mods/public/art/actors/geology/stone_desert_furrowed.xml
index f39deb243a..20be7c68db 100644
--- a/binaries/data/mods/public/art/actors/geology/stone_desert_furrowed.xml
+++ b/binaries/data/mods/public/art/actors/geology/stone_desert_furrowed.xml
@@ -35,5 +35,5 @@
       </textures>
     </variant>
   </group>
-  <material>player_trans_parallax.xml</material>
+  <material>no_trans_norm_spec.xml</material>
 </actor>
diff --git a/binaries/data/mods/public/art/actors/geology/stone_savanna_cubic_weathered.xml b/binaries/data/mods/public/art/actors/geology/stone_savanna_cubic_weathered.xml
index e9818bc012..6987ee7db0 100644
--- a/binaries/data/mods/public/art/actors/geology/stone_savanna_cubic_weathered.xml
+++ b/binaries/data/mods/public/art/actors/geology/stone_savanna_cubic_weathered.xml
@@ -35,5 +35,5 @@
       </textures>
     </variant>
   </group>
-  <material>player_trans_parallax.xml</material>
+  <material>no_trans_norm_spec.xml</material>
 </actor>
diff --git a/binaries/data/mods/public/art/actors/geology/stone_temperate_cubic_weathered.xml b/binaries/data/mods/public/art/actors/geology/stone_temperate_cubic_weathered.xml
index dd99090514..fffe1b0827 100644
--- a/binaries/data/mods/public/art/actors/geology/stone_temperate_cubic_weathered.xml
+++ b/binaries/data/mods/public/art/actors/geology/stone_temperate_cubic_weathered.xml
@@ -35,5 +35,5 @@
       </textures>
     </variant>
   </group>
-  <material>player_trans_parallax.xml</material>
+  <material>no_trans_norm_spec.xml</material>
 </actor>
diff --git a/binaries/data/mods/public/art/actors/geology/stone_tropic_cubic_weathered.xml b/binaries/data/mods/public/art/actors/geology/stone_tropic_cubic_weathered.xml
index d2b7cd3995..d82aed0b2d 100644
--- a/binaries/data/mods/public/art/actors/geology/stone_tropic_cubic_weathered.xml
+++ b/binaries/data/mods/public/art/actors/geology/stone_tropic_cubic_weathered.xml
@@ -35,5 +35,5 @@
       </textures>
     </variant>
   </group>
-  <material>player_trans_parallax.xml</material>
+  <material>no_trans_norm_spec.xml</material>
 </actor>