Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic

diff --combined misc/tools/cached-converter.sh
index 59cc376f95acbbb5212916e3a1531e68a323b860,6566f7623d62c290556df87b378b3d89c2d2515d..b3fcb87239667da20932a8e7aac9c46387939401
--- 1/misc/tools/cached-converter.sh
--- 2/misc/tools/cached-converter.sh
+++ b/misc/tools/cached-converter.sh
@@@ -13,6 -13,9 +13,9 @@@ set -
  : ${ogg_qual:=1}
  : ${del_src:=false}
  : ${git_src_repo:=}
+ : ${dds_noalpha:=dxt1}
+ : ${dds_prealpha:=dxt4}
+ : ${dds_sepalpha:=dxt5}
  
  selfprofile_t0=`date +%s`
  selfprofile_step=init
@@@ -146,7 -149,7 +149,7 @@@ reduce_jpeg2_dds(
        ia=$1; shift
        o=$1; shift; shift 
        convert "$i" "$ia" -compose CopyOpacity -composite "$tmpdir/x.tga" && \
-       "$meprefix"compress-texture "$dds_tool" dxt5 "$tmpdir/x.tga" "$o" $1
+       "$meprefix"compress-texture "$dds_tool" "$dds_sepalpha" "$tmpdir/x.tga" "$o" $1
  }
  
  reduce_jpeg2_dds_premul()
@@@ -155,7 -158,7 +158,7 @@@
        ia=$1; shift
        o=$1; shift; shift 
        convert "$i" "$ia" -compose CopyOpacity -composite "$tmpdir/x.tga" && \
-       "$meprefix"compress-texture "$dds_tool" dxt4 "$tmpdir/x.tga" "$o" $1
+       "$meprefix"compress-texture "$dds_tool" "$dds_prealpha" "$tmpdir/x.tga" "$o" $1
  }
  
  reduce_jpeg2_jpeg2()
@@@ -215,7 -218,7 +218,7 @@@ reduce_rgba_dds(
        i=$1; shift; shift
        o=$1; shift; shift
        convert "$i" "$tmpdir/x.tga" && \
-       "$meprefix"compress-texture "$dds_tool" dxt5 "$tmpdir/x.tga" "$o" $1
+       "$meprefix"compress-texture "$dds_tool" "$dds_sepalpha" "$tmpdir/x.tga" "$o" $1
  }
  
  reduce_rgba_dds_premul()
@@@ -223,7 -226,7 +226,7 @@@
        i=$1; shift; shift
        o=$1; shift; shift
        convert "$i" "$tmpdir/x.tga" && \
-       "$meprefix"compress-texture "$dds_tool" dxt4 "$tmpdir/x.tga" "$o" $1
+       "$meprefix"compress-texture "$dds_tool" "$dds_prealpha" "$tmpdir/x.tga" "$o" $1
  }
  
  reduce_rgba_jpeg2()
@@@ -248,7 -251,7 +251,7 @@@ reduce_rgb_dds(
        i=$1; shift; shift
        o=$1; shift; shift
        convert "$i" "$tmpdir/x.tga" && \
-       "$meprefix"compress-texture "$dds_tool" dxt1 "$tmpdir/x.tga" "$o" $1
+       "$meprefix"compress-texture "$dds_tool" "$dds_noalpha" "$tmpdir/x.tga" "$o" $1
  }
  
  reduce_rgb_jpeg()
@@@ -292,7 -295,6 +295,7 @@@ for F in "$@"; d
        case "$f" in
                ./sounds/misc/talk*.wav) will_ogg=false ;; # engine "feature"
                *_bump) will_dds=false ;;
 +              *_norm) will_dds=false ;; # bad quality
                ./models/player/*) will_dds=false ;;
                ./models/sprites/*) will_dds=false ;;
                ./textures/*) ;;