From 1d89a76d13a81afc791f280038c3a30ce537434b Mon Sep 17 00:00:00 2001
From: James Turner <zakalawe@mac.com>
Date: Thu, 7 May 2020 11:47:25 +0100
Subject: [PATCH] Old-style texture compression: better check

Make even more sure new-style texture-compression is active, before
deciding which old-style mode to use.
---
 simgear/scene/util/SGSceneFeatures.cxx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/simgear/scene/util/SGSceneFeatures.cxx b/simgear/scene/util/SGSceneFeatures.cxx
index 04b46a01..23f4e849 100644
--- a/simgear/scene/util/SGSceneFeatures.cxx
+++ b/simgear/scene/util/SGSceneFeatures.cxx
@@ -70,7 +70,7 @@ void
 SGSceneFeatures::applyTextureCompression(osg::Texture* texture) const
 {
     // if the texture cache is active, always use the file data format
-    if (_TextureCacheCompressionActive) {
+    if (_TextureCacheActive && _TextureCacheCompressionActive) {
         texture->setInternalFormatMode(osg::Texture::USE_IMAGE_DATA_FORMAT);
     } else {
         // keep the older texture compression working, some people need it