Merge remote-tracking branch 'upstream/master' into osganimation

include/osg/BoundingSphere

@@ -64,7 +64,7 @@ class BoundingSphereImpl
         inline bool valid() const { return _radius>=0.0; }
 
         inline bool operator == (const BoundingSphereImpl& rhs) const { return _center==rhs._center && _radius==rhs._radius; }
-        inline bool operator != (const BoundingSphereImpl& rhs) const { return _center!=rhs._center || _radius==rhs._radius; }
+        inline bool operator != (const BoundingSphereImpl& rhs) const { return _center!=rhs._center || _radius!=rhs._radius; }
 
         /** Set the bounding sphere to the given center/radius using floats. */
         inline void set(const vec_type& center,value_type radius)

src/osg/Program.cpp

@@ -517,9 +517,10 @@ void Program::apply( osg::State& state ) const
         // for shader debugging: to minimize performance impact,
         // optionally validate based on notify level.
         // TODO: enable this using notify level, or perhaps its own getenv()?
+#ifndef __APPLE__
         if( osg::isNotifyEnabled(osg::INFO) )
             pcp->validateProgram();
-
+#endif
         pcp->useProgram();
         state.setLastAppliedProgramObject(pcp);
     }