[Orxonox-commit 5097] r9762 - in data/trunk: materials models

[landauf at orxonox.net]

Author: landauf
Date: 2013-11-10 20:00:49 +0100 (Sun, 10 Nov 2013)
New Revision: 9762

Added:
   data/trunk/materials/LaserBeam2.material
   data/trunk/models/LaserBeam2.mesh
Removed:
   data/trunk/materials/LaserBeam.material
   data/trunk/models/LaserBeam.mesh
Log:
renamed LaserBeam as LaserBeam2 (because there's already another model called laserbeam)

Deleted: data/trunk/materials/LaserBeam.material
===================================================================
--- data/trunk/materials/LaserBeam.material	2013-11-10 17:43:14 UTC (rev 9761)
+++ data/trunk/materials/LaserBeam.material	2013-11-10 19:00:49 UTC (rev 9762)
@@ -1,21 +0,0 @@
-// LaserBeam genrated by blender2ogre 0.5.8
-
-material LaserBeam 
-{
-	technique
-	{
-		pass
-		{
-			lighting off
-			depth_write off
-			scene_blend add
-			texture_unit
-			{
-				texture LaserBlau2.png
-				colour_op modulate
-			}
-		}
-
-	}
-    receive_shadows on
-}

Copied: data/trunk/materials/LaserBeam2.material (from rev 9761, data/trunk/materials/LaserBeam.material)
===================================================================
--- data/trunk/materials/LaserBeam2.material	                        (rev 0)
+++ data/trunk/materials/LaserBeam2.material	2013-11-10 19:00:49 UTC (rev 9762)
@@ -0,0 +1,21 @@
+// LaserBeam2 genrated by blender2ogre 0.5.8
+
+material LaserBeam2
+{
+	technique
+	{
+		pass
+		{
+			lighting off
+			depth_write off
+			scene_blend add
+			texture_unit
+			{
+				texture LaserBlau2.png
+				colour_op modulate
+			}
+		}
+
+	}
+    receive_shadows on
+}

Deleted: data/trunk/models/LaserBeam.mesh
===================================================================
(Binary files differ)

Copied: data/trunk/models/LaserBeam2.mesh (from rev 9761, data/trunk/models/LaserBeam.mesh)
===================================================================
(Binary files differ)