From bd4eebf3a7acdb1f889fb9905175b984201b8008 Mon Sep 17 00:00:00 2001
From: Rudolf Polzer <divverent@xonotic.org>
Date: Wed, 14 Aug 2013 10:33:16 +0200
Subject: [PATCH] Revert "moving 2 textures to 'base'"

This reverts commit baf1d487a81f92b8452e38efdb0a18ca6a1bb211.
---
 scripts/exomorphx.shader                            |  12 ++++++------
 .../exomorphx/{base => floor}/metal_floor04b.tga    | Bin
 .../{base => floor}/metal_floor04b_gloss.tga        | Bin
 .../{base => floor}/metal_floor04b_norm.tga         | Bin
 .../{base => floor}/metal_floor04b_reflect.tga      | Bin
 .../exomorphx/{base => floor}/metal_floor04c.tga    | Bin
 .../{base => floor}/metal_floor04c_gloss.tga        | Bin
 .../{base => floor}/metal_floor04c_norm.tga         | Bin
 .../{base => floor}/metal_floor04c_reflect.tga      | Bin
 9 files changed, 6 insertions(+), 6 deletions(-)
 rename textures/exomorphx/{base => floor}/metal_floor04b.tga (100%)
 rename textures/exomorphx/{base => floor}/metal_floor04b_gloss.tga (100%)
 rename textures/exomorphx/{base => floor}/metal_floor04b_norm.tga (100%)
 rename textures/exomorphx/{base => floor}/metal_floor04b_reflect.tga (100%)
 rename textures/exomorphx/{base => floor}/metal_floor04c.tga (100%)
 rename textures/exomorphx/{base => floor}/metal_floor04c_gloss.tga (100%)
 rename textures/exomorphx/{base => floor}/metal_floor04c_norm.tga (100%)
 rename textures/exomorphx/{base => floor}/metal_floor04c_reflect.tga (100%)

diff --git a/scripts/exomorphx.shader b/scripts/exomorphx.shader
index d5d280aa..78cfb384 100644
--- a/scripts/exomorphx.shader
+++ b/scripts/exomorphx.shader
@@ -1694,9 +1694,9 @@ textures/exomorphx/floor-metal_floor04a
 	}
 }
 
-textures/exomorphx/base-metal_floor04b
+textures/exomorphx/floor-metal_floor04b
 {
-	qer_editorimage textures/exomorphx/base/metal_floor04b
+	qer_editorimage textures/exomorphx/floor/metal_floor04b
 	dpoffsetmapping - 2.28641290560094684604 match8 220.49524300000000000000
 	dpglossintensitymod  2
 	dpglossexponentmod  4
@@ -1705,7 +1705,7 @@ textures/exomorphx/base-metal_floor04b
 	q3map_bouncescale 1.50
 
 	{
-		map textures/exomorphx/base/metal_floor04b
+		map textures/exomorphx/floor/metal_floor04b
 	}
 
 	{
@@ -1716,9 +1716,9 @@ textures/exomorphx/base-metal_floor04b
 	}
 }
 
-textures/exomorphx/base-metal_floor04c
+textures/exomorphx/floor-metal_floor04c
 {
-	qer_editorimage textures/exomorphx/base/metal_floor04c
+	qer_editorimage textures/exomorphx/floor/metal_floor04c
 	dpoffsetmapping - 2.28641290560094684604 match8 220.49524300000000000000
 	dpglossintensitymod  2
 	dpglossexponentmod  4
@@ -1727,7 +1727,7 @@ textures/exomorphx/base-metal_floor04c
 	q3map_bouncescale 1.50
 
 	{
-		map textures/exomorphx/base/metal_floor04c
+		map textures/exomorphx/floor/metal_floor04c
 	}
 
 	{
diff --git a/textures/exomorphx/base/metal_floor04b.tga b/textures/exomorphx/floor/metal_floor04b.tga
similarity index 100%
rename from textures/exomorphx/base/metal_floor04b.tga
rename to textures/exomorphx/floor/metal_floor04b.tga
diff --git a/textures/exomorphx/base/metal_floor04b_gloss.tga b/textures/exomorphx/floor/metal_floor04b_gloss.tga
similarity index 100%
rename from textures/exomorphx/base/metal_floor04b_gloss.tga
rename to textures/exomorphx/floor/metal_floor04b_gloss.tga
diff --git a/textures/exomorphx/base/metal_floor04b_norm.tga b/textures/exomorphx/floor/metal_floor04b_norm.tga
similarity index 100%
rename from textures/exomorphx/base/metal_floor04b_norm.tga
rename to textures/exomorphx/floor/metal_floor04b_norm.tga
diff --git a/textures/exomorphx/base/metal_floor04b_reflect.tga b/textures/exomorphx/floor/metal_floor04b_reflect.tga
similarity index 100%
rename from textures/exomorphx/base/metal_floor04b_reflect.tga
rename to textures/exomorphx/floor/metal_floor04b_reflect.tga
diff --git a/textures/exomorphx/base/metal_floor04c.tga b/textures/exomorphx/floor/metal_floor04c.tga
similarity index 100%
rename from textures/exomorphx/base/metal_floor04c.tga
rename to textures/exomorphx/floor/metal_floor04c.tga
diff --git a/textures/exomorphx/base/metal_floor04c_gloss.tga b/textures/exomorphx/floor/metal_floor04c_gloss.tga
similarity index 100%
rename from textures/exomorphx/base/metal_floor04c_gloss.tga
rename to textures/exomorphx/floor/metal_floor04c_gloss.tga
diff --git a/textures/exomorphx/base/metal_floor04c_norm.tga b/textures/exomorphx/floor/metal_floor04c_norm.tga
similarity index 100%
rename from textures/exomorphx/base/metal_floor04c_norm.tga
rename to textures/exomorphx/floor/metal_floor04c_norm.tga
diff --git a/textures/exomorphx/base/metal_floor04c_reflect.tga b/textures/exomorphx/floor/metal_floor04c_reflect.tga
similarity index 100%
rename from textures/exomorphx/base/metal_floor04c_reflect.tga
rename to textures/exomorphx/floor/metal_floor04c_reflect.tga
-- 
2.39.2