summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2012-06-11 15:00:22 +0300
committerAndrei Karas <akaras@inbox.ru>2012-06-11 15:00:22 +0300
commit6bb8fd3d6ed1141d3467df438f4a2938783a3bb0 (patch)
tree5c4c77360ec68993c5c3709828bb57acc289c050
parent64e65af6ac803afdc038d5bc64754186f09f7686 (diff)
downloadtools-6bb8fd3d6ed1141d3467df438f4a2938783a3bb0.tar.gz
tools-6bb8fd3d6ed1141d3467df438f4a2938783a3bb0.tar.bz2
tools-6bb8fd3d6ed1141d3467df438f4a2938783a3bb0.tar.xz
tools-6bb8fd3d6ed1141d3467df438f4a2938783a3bb0.zip
textxml: fix false positives with some image sizes.
-rwxr-xr-xtestxml/testxml.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/testxml/testxml.py b/testxml/testxml.py
index cd1f58c..2f8becc 100755
--- a/testxml/testxml.py
+++ b/testxml/testxml.py
@@ -494,7 +494,7 @@ def testSpriteFile(id, fullPath, file, fileLoc, dnum, variant, checkAction, iser
tmp = int(width)
else:
tmp = s1
- if sizes[0] != s1 and tmp != sizesOGL[0]:
+ if sizes[0] != s1 and tmp != sizesOGL[0] and sizes[0] != sizesOGL[0]:
showMsgSprite(fileLoc, "image width " + str(sizes[0]) + \
" (need " + str(tmp) + ") is not multiply to frame size " + width + ", image:" + image, False)
@@ -516,7 +516,7 @@ def testSpriteFile(id, fullPath, file, fileLoc, dnum, variant, checkAction, iser
else:
tmp = s2;
- if sizes[1] != s2 and tmp != sizesOGL[1]:
+ if sizes[1] != s2 and tmp != sizesOGL[1] and sizes[1] != sizesOGL[1]:
showMsgSprite(fileLoc, "image height " + str(sizes[1]) + \
" (need " + str(tmp) + ") is not multiply to frame size " + height + ", image:" + image, False)