From 5c1fd0679968425706d116f2ba5637ade73e6b8a Mon Sep 17 00:00:00 2001 From: David Rose Date: Fri, 19 Feb 2010 20:38:11 +0000 Subject: [PATCH] don't double-compress images --- panda/src/gobj/texture.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/panda/src/gobj/texture.cxx b/panda/src/gobj/texture.cxx index 769faa6e7f..1e731d2e69 100644 --- a/panda/src/gobj/texture.cxx +++ b/panda/src/gobj/texture.cxx @@ -5738,7 +5738,7 @@ filter_3d_unsigned_short(unsigned char *&p, const unsigned char *&q, bool Texture:: do_squish(Texture::CompressionMode compression, int squish_flags) { #ifdef HAVE_SQUISH - if (_ram_images.empty()) { + if (_ram_images.empty() || _ram_image_compression != CM_off) { return false; }