[nexuiz-commits] r8281 - trunk/misc/tools

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-11-14 17:25:17 -0500 (Sat, 14 Nov 2009)
New Revision: 8281

Modified:
   trunk/misc/tools/autoshader.sh
Log:
has_alpha function in autoshader.sh: also detect foo_alpha.jpg files


Modified: trunk/misc/tools/autoshader.sh
===================================================================
--- trunk/misc/tools/autoshader.sh	2009-11-14 21:22:31 UTC (rev 8280)
+++ trunk/misc/tools/autoshader.sh	2009-11-14 22:25:17 UTC (rev 8281)
@@ -147,7 +147,7 @@
 
 has_alpha()
 {
-	convert "$1" -depth 8 RGBA:- | xxd -c 4 -g 1 | grep -v " ff  " >/dev/null
+	[ -f "${1%.jpg}_alpha.jpg" ] || convert "$1" -depth 8 RGBA:- | xxd -c 4 -g 1 | grep -v " ff  " >/dev/null
 }
 
 autoshaders()