instead, exclude background_l2 from that hashing stuff

[xonotic/xonotic.git] / misc / tools / cached-converter.sh

diff --git a/misc/tools/cached-converter.sh b/misc/tools/cached-converter.sh
index c5b3bef7311eaa57fdeac63d74bd8182d065ad9c..06433d0856783deb4e1863eb87063e21d84fef8b 100755 (executable)
--- a/misc/tools/cached-converter.sh
+++ b/misc/tools/cached-converter.sh
@@ -49,7 +49,15 @@ cached()
        if [ x"$infile1/../$infile2" = x"$lastinfiles" ]; then
                sum=$lastinfileshash
        else
-               if [ -n "$git_src_repo" ]; then
+               evil=false
+               for infile in "$infile1" "$infile2"; do
+                       case "$infile" in
+                               */background_l2.tga)
+                                       evil=true
+                                       ;;
+                       esac
+               done
+               if [ -n "$git_src_repo" ] && ! $evil; then
                        sum=`( cd "$git_src_repo"; git rev-parse --revs-only HEAD:"${infile1#./}" | grep . ) || git hash-object "$infile1"`
                        if [ -n "$infile2" ]; then
                                sum=$sum`( cd "$git_src_repo"; git rev-parse --revs-only HEAD:"${infile2#./}" | grep . ) || git hash-object "$infile2"`
@@ -263,7 +271,7 @@ for F in "$@"; do
 
        pm=
        case "$f" in
-               ./particles/*) # deluxemap
+               ./particles/particlefont) # particlefont uses premultiplied alpha
                        pm=_premul
                        ;;
        esac