From b27ecfeaf5d508d6ebf786f3137d4cd7cc75e42f Mon Sep 17 00:00:00 2001 From: David Rose Date: Thu, 15 Jan 2009 01:11:33 +0000 Subject: [PATCH] slightly simpler handing of ram images --- panda/src/tinydisplay/tinyGraphicsStateGuardian.cxx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/panda/src/tinydisplay/tinyGraphicsStateGuardian.cxx b/panda/src/tinydisplay/tinyGraphicsStateGuardian.cxx index 47d3353009..b96afb6d30 100644 --- a/panda/src/tinydisplay/tinyGraphicsStateGuardian.cxx +++ b/panda/src/tinydisplay/tinyGraphicsStateGuardian.cxx @@ -2324,8 +2324,7 @@ upload_texture(TinyTextureContext *gtc, bool force) { Texture *tex = gtc->get_texture(); if (_incomplete_render && !force) { - bool has_image = _supports_compressed_texture ? tex->has_ram_image() : tex->has_uncompressed_ram_image(); - if (!has_image && tex->might_have_ram_image() && + if (!tex->has_ram_image() && tex->might_have_ram_image() && tex->has_simple_ram_image() && !_loader.is_null()) { // If we don't have the texture data right now, go get it, but in