[Orxonox-commit 5994] r10653 - in data/trunk: images/effects materials

[fvultier at orxonox.net]

Author: fvultier
Date: 2015-10-18 14:35:35 +0200 (Sun, 18 Oct 2015)
New Revision: 10653

Removed:
   data/trunk/images/effects/flare_energy.xcf
Modified:
   data/trunk/materials/stunweapon.material
Log:
Fixed bug in the material of a weapon of SpaceshipASSFF2. There is no more an error when loading this ship. Removed useless GIMP file.

Deleted: data/trunk/images/effects/flare_energy.xcf
===================================================================
(Binary files differ)

Modified: data/trunk/materials/stunweapon.material
===================================================================
--- data/trunk/materials/stunweapon.material	2015-10-16 13:25:17 UTC (rev 10652)
+++ data/trunk/materials/stunweapon.material	2015-10-18 12:35:35 UTC (rev 10653)
@@ -10,7 +10,7 @@
 			emissive 0.000000 0.000000 0.000000 1.000000
 			texture_unit
 			{
-				texture model1-UV_Cylinder_firsttry.png
+				texture stunweapon.png
 				colour_op modulate
 			}
 		}