Set both min and mag filters when exporting textures

[libs/gl.git] / scripts / maketex.py

diff --git a/scripts/maketex.py b/scripts/maketex.py
index 4da7866e7593b2f3abdfae7eaaa8e4254cd193f1..520be8424b02f39740b663bd03fc83c736e05f54 100755 (executable)
--- a/scripts/maketex.py
+++ b/scripts/maketex.py
@@ -11,10 +11,10 @@ def escape(str):
                        result += "\\%03o"%ord(c)
                else:
                        result += c
-       return result;
+       return result
 
 def make_tex(fn, filter="LINEAR", anisotropy=0, wrap=None, srgb=False):
-       import Image
+       from PIL import Image
 
        img = Image.open(fn)
 
@@ -39,7 +39,10 @@ def make_tex(fn, filter="LINEAR", anisotropy=0, wrap=None, srgb=False):
        data = list(img.getdata())
        for y in range(img.size[1]):
                i = (img.size[1]-1-y)*img.size[0]
-               result += escape("".join(["".join([chr(v) for v in p]) for p in data[i:i+img.size[0]]]))
+               if fmt=="LUMINANCE" or fmt=="SLUMINANCE":
+                       result += escape("".join([chr(v) for v in data[i:i+img.size[0]]]))
+               else:
+                       result += escape("".join(["".join([chr(v) for v in p]) for p in data[i:i+img.size[0]]]))
        result += "\";\n"
 
        return result