From 86d739cc8578a7c1683a379bb487c2d834080fab Mon Sep 17 00:00:00 2001 From: Richard Harrison Date: Sun, 25 Nov 2018 23:48:58 +0100 Subject: [PATCH] DDS TextureCache: remove unused code to support non-persistent images - this didn't compile for Stuart on OSG3.2 and it's not used. --- simgear/scene/model/ModelRegistry.cxx | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/simgear/scene/model/ModelRegistry.cxx b/simgear/scene/model/ModelRegistry.cxx index 2aea1bc8..8ba935bd 100644 --- a/simgear/scene/model/ModelRegistry.cxx +++ b/simgear/scene/model/ModelRegistry.cxx @@ -221,7 +221,6 @@ ModelRegistry::readImage(const string& fileName, init = true; } - bool persist = true; bool cache_active = SGSceneFeatures::instance()->getTextureCacheActive(); bool compress_solid = SGSceneFeatures::instance()->getTextureCacheCompressionActive(); bool compress_transparent = SGSceneFeatures::instance()->getTextureCacheCompressionActiveTransparent(); @@ -339,14 +338,7 @@ ModelRegistry::readImage(const string& fileName, srcImage = simgear::effect::computeMipmap(srcImage, mipmapFunctions); } } - if (persist) { - registry->writeImage(*srcImage, newName, nopt); - //printf(" ->> written to %s\n", newName.c_str()); - - } - else { - return srcImage; - } + registry->writeImage(*srcImage, newName, nopt); absFileName = newName; } }