Modified Files:

	simgear/scene/model/SGMaterialAnimation.cxx:
	Olaf Flebbe: Use brakets around bitwise operations.
	Greetings from LinuxTag, Berlin ... :)

diff --git a/simgear/scene/model/SGMaterialAnimation.cxx b/simgear/scene/model/SGMaterialAnimation.cxx
index 9f967a14021dd5b619d1ee15103958f4bfe62cca..7e6a2acb0b0a266d12e1d1d77a9b24603176d712 100644 (file)
--- a/simgear/scene/model/SGMaterialAnimation.cxx
+++ b/simgear/scene/model/SGMaterialAnimation.cxx
@@ -471,13 +471,13 @@ SGMaterialAnimation::createAnimationGroup(osg::Group& parent)
        mat->setColorMode(osg::Material::OFF);
       } else if ((suppliedColors & defaultColorModeMask) != 0) {
        // First deal with the complicated AMBIENT/DIFFUSE case.
-       if (defaultColorModeMask & AMBIENT_DIFFUSE != 0) {
+       if ((defaultColorModeMask & AMBIENT_DIFFUSE) != 0) {
          // glColor can supply colors not specified by the animation.
          unsigned matColorModeMask = ((~suppliedColors & defaultColorModeMask)
                                       & AMBIENT_DIFFUSE);
-         if (matColorModeMask & DIFFUSE != 0)
+         if ((matColorModeMask & DIFFUSE) != 0)
            mat->setColorMode(osg::Material::DIFFUSE);
-         else if (matColorModeMask & AMBIENT != 0)
+         else if ((matColorModeMask & AMBIENT) != 0)
            mat->setColorMode(osg::Material::AMBIENT);
          else
            mat->setColorMode(osg::Material::OFF);