From cb2af961db3622518c46b2e4e1484ecd7101bcfd Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Fri, 11 Mar 2016 15:35:07 +0000
Subject: [PATCH] From Jannik Heller, Wrong function call in
 setTextureAttributeAndModes "From I think that this piece of code in
 StateSet::setTextureAttributeAndModes is a copy&paste mistake:

            OSG_NOTICE<<"Warning: non texture attribute '"<<attribute->className()<<"' passed to setTextureAttributeAndModes(unit,attr,value), "<<std::endl;
            OSG_NOTICE<<"         assuming setAttributeAndModes(attr,value) instead."<<std::endl;
            OSG_NOTICE<<"         please change calling code to use appropriate call."<<std::endl;
            setAttribute(attribute,value);

As per the warning message it should be calling setAttributeAndModes(attribute,value); ."
---
 .../English.lproj/InfoPlist.strings             | Bin 202 -> 101 bytes
 src/osg/StateSet.cpp                            |   2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/osgviewerCocoa/English.lproj/InfoPlist.strings b/examples/osgviewerCocoa/English.lproj/InfoPlist.strings
index be1baf7257980d32c024ba8a3bb6f4c2d82cafec..3e2e35b4047f560cde789be5eefae5e320d54adf 100644
GIT binary patch
literal 101
zcmdPbQt-)7PRz-yN=;EHOD!tS%+D)U$WK%7%uCDHE6B+#E>Xx%tt?j1(&ysx3-&0@
zP0R~QO-xBl%1L$3FQ_caOwTA$uvJhxv{E5H-nY^@Ker$;uhK6uH#I(9N5ROzz)Z;+
E00b~1rT_o{

literal 202
zcmW-ZO%B0e6h+V2D#Wl6#K1(1Oh_<b0aCOG{Yi_Yc4U({{qmCcbMJlU`(sE%mlXv^
zV(wgdlW<adIV)<Fg5244ruL;*>OP<h`I?97&2$q|k<5;@VaI|encSSMek?cU;8((2
nLg_~(|I8&YW^#Ib?0aji+om#eEuoPZdnLi`n;J8+CjLzS8lfZM

diff --git a/src/osg/StateSet.cpp b/src/osg/StateSet.cpp
index 6650fd777..839ce2581 100644
--- a/src/osg/StateSet.cpp
+++ b/src/osg/StateSet.cpp
@@ -1296,7 +1296,7 @@ void StateSet::setTextureAttributeAndModes(unsigned int unit,StateAttribute *att
             OSG_NOTICE<<"Warning: non texture attribute '"<<attribute->className()<<"' passed to setTextureAttributeAndModes(unit,attr,value), "<<std::endl;
             OSG_NOTICE<<"         assuming setAttributeAndModes(attr,value) instead."<<std::endl;
             OSG_NOTICE<<"         please change calling code to use appropriate call."<<std::endl;
-            setAttribute(attribute,value);
+            setAttributeAndModes(attribute,value);
         }
     }
 }