X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=blobdiff_plain;f=misc%2Ftools%2Fcached-converter.sh;h=0eab3d6946f5ae9fc10048afd7704ffb38a35c97;hp=72f427c71d89bf150ac23dd4a4a40ba36431c74f;hb=fc00291a3cabd0fc24767a221a9231f27c1a3e97;hpb=2ebe7a33ca4fd24d8bcf0010a9af41e167f34c3e

diff --git a/misc/tools/cached-converter.sh b/misc/tools/cached-converter.sh
index 72f427c7..0eab3d69 100755
--- a/misc/tools/cached-converter.sh
+++ b/misc/tools/cached-converter.sh
@@ -12,6 +12,7 @@ set -e
 : ${do_ogg:=false}
 : ${ogg_qual:=1}
 : ${del_src:=false}
+: ${git_src_repo:=}
 
 me=$0
 case "$me" in
@@ -47,9 +48,16 @@ cached()
 	if [ x"$infile1/../$infile2" = x"$lastinfiles" ]; then
 		sum=$lastinfileshash
 	else
-		sum=`git hash-object "$infile1"`
-		if [ -n "$infile2" ]; then
-			sum=$sum`git hash-object "$infile2"`
+		if [ -n "$git_src_repo" ]; then
+			sum=`( cd "$git_src_repo"; git rev-parse HEAD:"$infile1" )`
+			if [ -n "$infile2" ]; then
+				sum=`( cd "$git_src_repo"; git rev-parse HEAD:"$infile2" )`
+			fi
+		else
+			sum=`git hash-object "$infile1"`
+			if [ -n "$infile2" ]; then
+				sum=$sum`git hash-object "$infile2"`
+			fi
 		fi
 		lastinfileshash=$sum
 	fi
@@ -179,6 +187,7 @@ for F in "$@"; do
 	case "$f" in
 		*_bump) will_dds=false ;;
 		./models/player/*) will_dds=false ;;
+		./models/sprites/*) will_dds=false ;;
 		./textures/*) ;;
 		./models/*) ;;
 		./particles/*) ;;