[osg-users] Regression caused by OSG_PROVIDE_READFILE change
James Turner
zakalawe at mac.com
Sat Mar 26 12:35:59 PDT 2016
> On 26 Mar 2016, at 17:14, James Turner <zakalawe at mac.com> wrote:
>
>> Sorry to hear there is a regression. I've looked at your explanation and the code you linked to, and the relevant osg::StateSet::set*() methods and can't spot anything obvious wrong.
>
I got very lucky, and think I found the problem:
diff --git a/include/osg/StateSet b/include/osg/StateSet
index 6546832..f73ffc1 100644
--- a/include/osg/StateSet
+++ b/include/osg/StateSet
@@ -238,7 +238,7 @@ class OSG_EXPORT StateSet : public Object
/** Set this StateSet to contain specified attribute and set the associated GLMode's to specified value.*/
void setTextureAttributeAndModes(unsigned int unit,StateAttribute *attribute, StateAttribute::GLModeValue value=StateAttribute::ON);
- template<class T> void setTextureAttributeAndModes(unsigned int unit, const ref_ptr<T>& attribute, StateAttribute::OverrideValue value=StateAttribute::OFF) { setTextureAttributeAndModes( unit, attribute.get(), value); }
+ template<class T> void setTextureAttributeAndModes(unsigned int unit, const ref_ptr<T>& attribute, StateAttribute::OverrideValue value=StateAttribute::ON) { setTextureAttributeAndModes( unit, attribute.get(), value); }
/** remove texture attribute of specified type from StateSet.*/
void removeTextureAttribute(unsigned int unit, StateAttribute::Type type);
… this brings the template into line with the non-templated version.
Kind regards,
James
More information about the osg-users
mailing list