diff --git a/include/osg/NodeCallback b/include/osg/NodeCallback index edaedd38c..f3b036f66 100644 --- a/include/osg/NodeCallback +++ b/include/osg/NodeCallback @@ -23,7 +23,7 @@ class SG_EXPORT NodeCallback : public Referenced { REQUIRES_TRAVERSAL = 0x1, REQUIRES_PARENT_PATH = 0x2, REQUIRES_ACCUMULATED_MATRIX = 0x4, - REQUIRES_ACCUMULATED_INVERSE = 0x8, + REQUIRES_ACCUMULATED_INVERSE = 0x8 }; NodeCallback(const Requirements ncr=NO_REQUIREMENTS):_requirements(ncr) {} diff --git a/src/osg/DisplaySettings.cpp b/src/osg/DisplaySettings.cpp index 356870895..98f977cae 100644 --- a/src/osg/DisplaySettings.cpp +++ b/src/osg/DisplaySettings.cpp @@ -66,7 +66,7 @@ void DisplaySettings::setDefaults() void DisplaySettings::readEnvironmentalVariables() { char *ptr; - if( (ptr = getenv("OSG_STEREO_MODE")) ) + if( (ptr = getenv("OSG_STEREO_MODE")) != 0) { if (strcmp(ptr,"QUAD_BUFFER")==0) { @@ -89,7 +89,7 @@ void DisplaySettings::readEnvironmentalVariables() } } - if( (ptr = getenv("OSG_STEREO")) ) + if( (ptr = getenv("OSG_STEREO")) != 0) { if (strcmp(ptr,"OFF")==0) { @@ -102,17 +102,17 @@ void DisplaySettings::readEnvironmentalVariables() } } - if( (ptr = getenv("OSG_EYE_SEPERATION")) ) + if( (ptr = getenv("OSG_EYE_SEPERATION")) != 0) { _eyeSeperation = atof(ptr); } - if( (ptr = getenv("OSG_SCREEN_DISTANCE")) ) + if( (ptr = getenv("OSG_SCREEN_DISTANCE")) != 0) { _screenDistance = atof(ptr); } - if( (ptr = getenv("OSG_SCREEN_HEIGHT")) ) + if( (ptr = getenv("OSG_SCREEN_HEIGHT")) != 0) { _screenHeight = atof(ptr); } diff --git a/src/osg/PolygonMode.cpp b/src/osg/PolygonMode.cpp index fa77cee5d..0a622bd83 100644 --- a/src/osg/PolygonMode.cpp +++ b/src/osg/PolygonMode.cpp @@ -42,10 +42,8 @@ const PolygonMode::Mode PolygonMode::getMode(const Face face) const { case(FRONT): return _modeFront; - break; case(BACK): return _modeBack; - break; case(FRONT_AND_BACK): return _modeFront; }