Work around apparent OSG 3.2.0 normal binding bug.

[simgear.git] / simgear / scene / material / Technique.cxx

diff --git a/simgear/scene/material/Technique.cxx b/simgear/scene/material/Technique.cxx
index a3c5e34e5363efa5f52f47b3d0740cc3f3355813..4caa9d0cd3b91485239b98df54272196c7a6ed07 100644 (file)
--- a/simgear/scene/material/Technique.cxx
+++ b/simgear/scene/material/Technique.cxx
@@ -167,12 +167,12 @@ Technique::processDrawables(const EffectGeode::DrawablesIterator& begin,
     BOOST_FOREACH(ref_ptr<Pass>& pass, passes)
     {
         osg::ref_ptr<osg::StateSet> ss = pass;
-        if (ecv && ( pass->getBufferUnitList().size() != 0 || pass->getPositionedUniformMap().size() != 0 ) ) {
+        if (ecv && ( ! pass->getBufferUnitList().empty() || ! pass->getPositionedUniformMap().empty() ) ) {
             ss = static_cast<osg::StateSet*>(
-                pass->clone( osg::CopyOp( ( pass->getBufferUnitList().size() != 0 ?
+                pass->clone( osg::CopyOp( ( ! pass->getBufferUnitList().empty() ?
                                                         osg::CopyOp::DEEP_COPY_TEXTURES :
                                                         osg::CopyOp::SHALLOW_COPY ) |
-                                           ( pass->getPositionedUniformMap().size() != 0 ?
+                                           ( ! pass->getPositionedUniformMap().empty() ?
                                                         osg::CopyOp::DEEP_COPY_UNIFORMS :
                                                         osg::CopyOp::SHALLOW_COPY ) )
                 )