From 68710d43bebdf89a246bc4659addd9ea9d44bc8f Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Tue, 15 Dec 2009 17:25:12 +0000 Subject: [PATCH] From Sukender, warning fix --- src/osgGA/StateSetManipulator.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/osgGA/StateSetManipulator.cpp b/src/osgGA/StateSetManipulator.cpp index 4dcd1b2d4..7c4907987 100644 --- a/src/osgGA/StateSetManipulator.cpp +++ b/src/osgGA/StateSetManipulator.cpp @@ -97,13 +97,13 @@ bool StateSetManipulator::handle(const GUIEventAdapter& ea,GUIActionAdapter& aa) unsigned int mode = osg::StateAttribute::INHERIT|osg::StateAttribute::ON; - _texture = (_stateset->getTextureMode(0,GL_TEXTURE_2D)&mode) || - (_stateset->getTextureMode(0,GL_TEXTURE_3D)&mode) || - (_stateset->getTextureMode(0,GL_TEXTURE_RECTANGLE)&mode) || - (_stateset->getTextureMode(0,GL_TEXTURE_CUBE_MAP)&mode); + _texture = (_stateset->getTextureMode(0,GL_TEXTURE_2D)&mode)!=0 || + (_stateset->getTextureMode(0,GL_TEXTURE_3D)&mode)!=0 || + (_stateset->getTextureMode(0,GL_TEXTURE_RECTANGLE)&mode)!=0 || + (_stateset->getTextureMode(0,GL_TEXTURE_CUBE_MAP)&mode)!=0; #if !defined(OSG_GLES1_AVAILABLE) && !defined(OSG_GLES2_AVAILABLE) - _texture |= ((_stateset->getTextureMode(0,GL_TEXTURE_1D)&mode)!=0); + _texture |= (_stateset->getTextureMode(0,GL_TEXTURE_1D)&mode)!=0; #endif }