From d92fdafd5340d610bbd19177ee4ab0cd09c32963 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Thu, 31 Aug 2006 15:39:23 +0000 Subject: [PATCH] Fixed TextureAtlasVisitor bug where repeating textures were incorrectly assigned as non repeating. --- src/osgUtil/Optimizer.cpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/osgUtil/Optimizer.cpp b/src/osgUtil/Optimizer.cpp index fc75d9a20..59529a520 100644 --- a/src/osgUtil/Optimizer.cpp +++ b/src/osgUtil/Optimizer.cpp @@ -3798,7 +3798,6 @@ void Optimizer::TextureAtlasVisitor::optimize() return; } - Textures alreadyCheckedForRepeat; Textures texturesThatRepeat; Textures texturesThatRepeatAndAreOutOfRange; @@ -3814,10 +3813,8 @@ void Optimizer::TextureAtlasVisitor::optimize() for(unsigned int unit=0; unit(stateset->getTextureAttribute(unit,osg::StateAttribute::TEXTURE)); - if (texture && alreadyCheckedForRepeat.count(texture)==0) + if (texture) { - alreadyCheckedForRepeat.insert(texture); - bool s_repeat = texture->getWrap(osg::Texture2D::WRAP_S)==osg::Texture2D::REPEAT || texture->getWrap(osg::Texture2D::WRAP_S)==osg::Texture2D::MIRROR; @@ -3899,7 +3896,6 @@ void Optimizer::TextureAtlasVisitor::optimize() ++titr) { osg::Texture2D* texture = *titr; - alreadyCheckedForRepeat.insert(texture); bool s_repeat = texture->getWrap(osg::Texture2D::WRAP_S)==osg::Texture2D::REPEAT || texture->getWrap(osg::Texture2D::WRAP_S)==osg::Texture2D::MIRROR;