From 48225171e0bf95d5e9ec6404a89f69de3ed7a7ce Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Mon, 18 Jan 2016 13:10:14 +0000 Subject: [PATCH] From Jannik Heller, "This submission fixes a bug introduced in commit https://github.com/openscenegraph/osg/commit/5b17e3bc2a0c02cf84d891bfdccf14f170ee0ec8 "Introduced CMake option OSG_PROVIDE_READFILE option...". The added overload for StateSet::setAttributeAndModes was ignoring the mode setting. " --- include/osg/StateSet | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/osg/StateSet b/include/osg/StateSet index 35f4a2369..65468328b 100644 --- a/include/osg/StateSet +++ b/include/osg/StateSet @@ -165,7 +165,7 @@ class OSG_EXPORT StateSet : public Object /** Set this StateSet to contain specified attribute and set the associated GLMode's to specified value.*/ void setAttributeAndModes(StateAttribute *attribute, StateAttribute::GLModeValue value=StateAttribute::ON); - template void setAttributeAndModes(const ref_ptr& attribute, StateAttribute::GLModeValue value=StateAttribute::ON) { setAttribute(attribute.get(), value); } + template void setAttributeAndModes(const ref_ptr& attribute, StateAttribute::GLModeValue value=StateAttribute::ON) { setAttributeAndModes(attribute.get(), value); } /** remove attribute of specified type from StateSet.*/ void removeAttribute(StateAttribute::Type type, unsigned int member=0);