[Orxonox-commit 1590] r6308 - in data/trunk: materials/scripts models

[cdaniel at orxonox.net]

Author: cdaniel
Date: 2009-12-09 22:49:07 +0100 (Wed, 09 Dec 2009)
New Revision: 6308

Modified:
   data/trunk/materials/scripts/rocket.material
   data/trunk/models/rocket.mesh
Log:
fixed texture conflict with HXY. (material in rocket.material and HXY.material had the same name (default name: "material"). rocket material name now changed to "Rocket"

Modified: data/trunk/materials/scripts/rocket.material
===================================================================
--- data/trunk/materials/scripts/rocket.material	2009-12-09 21:09:27 UTC (rev 6307)
+++ data/trunk/materials/scripts/rocket.material	2009-12-09 21:49:07 UTC (rev 6308)
@@ -1,4 +1,4 @@
-material Material
+material Rocket
 {
 	receive_shadows on
 	technique

Modified: data/trunk/models/rocket.mesh
===================================================================
(Binary files differ)