From 40d8de2a1809c7fbf473dcc47be422926c7c3277 Mon Sep 17 00:00:00 2001
From: Mythos_Ruler <michael@wildfiregames.com>
Date: Sun, 1 Jul 2007 16:19:29 +0000
Subject: [PATCH] This was SVN commit r5219.

---
 .../actors/props/flora/bush_dese_dry_a.xml    | 18 ---------
 .../{bush_dese_a.xml => bush_desert_a.xml}    | 37 ++++++++++---------
 .../actors/props/flora/bush_desert_dry_a.xml  | 29 +++++++++++++++
 3 files changed, 48 insertions(+), 36 deletions(-)
 delete mode 100644 binaries/data/mods/official/art/actors/props/flora/bush_dese_dry_a.xml
 rename binaries/data/mods/official/art/actors/props/flora/{bush_dese_a.xml => bush_desert_a.xml} (86%)
 create mode 100644 binaries/data/mods/official/art/actors/props/flora/bush_desert_dry_a.xml

diff --git a/binaries/data/mods/official/art/actors/props/flora/bush_dese_dry_a.xml b/binaries/data/mods/official/art/actors/props/flora/bush_dese_dry_a.xml
deleted file mode 100644
index 5fd6eaf2f0..0000000000
--- a/binaries/data/mods/official/art/actors/props/flora/bush_dese_dry_a.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<actor version="1">
-
-  <castshadow/>
-
-  <group>
-    <variant frequency="100" name="Bush Desert Dry A1">
-      <mesh>gaia/bush_dese_a_1.pmd</mesh>
-      <texture>gaia/bush_dese_dry_a.dds</texture>
-    </variant>
-    <variant frequency="100" name="Bush Desert Dry A2">
-      <mesh>gaia/bush_dese_a_2.pmd</mesh>
-      <texture>gaia/bush_dese_dry_a.dds</texture>
-    </variant>
-  </group>
-
-  <material>basic_trans.xml</material>
-</actor>
diff --git a/binaries/data/mods/official/art/actors/props/flora/bush_dese_a.xml b/binaries/data/mods/official/art/actors/props/flora/bush_desert_a.xml
similarity index 86%
rename from binaries/data/mods/official/art/actors/props/flora/bush_dese_a.xml
rename to binaries/data/mods/official/art/actors/props/flora/bush_desert_a.xml
index c12c05eaa2..dc54d1e538 100644
--- a/binaries/data/mods/official/art/actors/props/flora/bush_dese_a.xml
+++ b/binaries/data/mods/official/art/actors/props/flora/bush_desert_a.xml
@@ -1,18 +1,19 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<actor version="1">
-
-  <castshadow/>
-
-  <group>
-    <variant frequency="100" name="Bush Desert A1">
-      <mesh>gaia/bush_dese_a_1.pmd</mesh>
-      <texture>gaia/bush_dese_a.dds</texture>
-    </variant>
-    <variant frequency="100" name="Bush Desert A2">
-      <mesh>gaia/bush_dese_a_2.pmd</mesh>
-      <texture>gaia/bush_dese_a.dds.dds</texture>
-    </variant>
-  </group>
-
-  <material>basic_trans.xml</material>
-</actor>
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<actor version="1">
+
+  <castshadow/>
+
+  <group>
+    <variant frequency="100" name="Bush Desert A1">
+      <mesh>gaia/bush_dese_a_1.pmd</mesh>
+      <texture>gaia/bush_dese_a.dds</texture>
+    </variant>
+    <variant frequency="100" name="Bush Desert A2">
+      <mesh>gaia/bush_dese_a_2.pmd</mesh>
+      <texture>gaia/bush_dese_a.dds</texture>
+    </variant>
+  </group>
+
+  <material>basic_trans.xml</material>
+
+</actor>
diff --git a/binaries/data/mods/official/art/actors/props/flora/bush_desert_dry_a.xml b/binaries/data/mods/official/art/actors/props/flora/bush_desert_dry_a.xml
new file mode 100644
index 0000000000..f74f8a259b
--- /dev/null
+++ b/binaries/data/mods/official/art/actors/props/flora/bush_desert_dry_a.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<actor version="1">
+
+  <castshadow/>
+
+  <group>
+    <variant frequency="1" name="Bush Desert Dry A1">
+      <mesh>gaia/bush_dese_a_1.pmd</mesh>
+    </variant>
+    <variant frequency="1" name="Bush Desert Dry A2">
+      <mesh>gaia/bush_dese_a_2.pmd</mesh>
+    </variant>
+  </group>
+
+  <group>
+    <variant frequency="1" name="Desert-brown">
+      <texture>gaia/bush_dese_dry_a.dds</texture>
+    </variant>
+    <variant frequency="1" name="Desert-burnt">
+      <texture>gaia/bush_dese_dry_b.dds</texture>
+    </variant>
+    <variant frequency="2" name="Desert-dusty">
+      <texture>gaia/bush_dese_dry_c.dds</texture>
+    </variant>
+  </group>
+
+  <material>basic_trans.xml</material>
+
+</actor>