FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

From Jannik Heller, "This submission fixes a bug introduced in commit 5b17e3bc2a "Introduced CMake option OSG_PROVIDE_READFILE option...". The added overload for StateSet::setAttributeAndModes was ignoring the mode setting.

Browse Source 
"
This commit is contained in:
Robert Osfield 2016-01-18 13:10:14 +00:00
parent ff1051a6fd
commit 55bb474c3b
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/osg/StateSet
View File

@ -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.*/ /** 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); void setAttributeAndModes(StateAttribute *attribute, StateAttribute::GLModeValue value=StateAttribute::ON);
template<class T> void setAttributeAndModes(const ref_ptr<T>& attribute, StateAttribute::GLModeValue value=StateAttribute::ON) { setAttribute(attribute.get(), value); } template<class T> void setAttributeAndModes(const ref_ptr<T>& attribute, StateAttribute::GLModeValue value=StateAttribute::ON) { setAttributeAndModes(attribute.get(), value); }
/** remove attribute of specified type from StateSet.*/ /** remove attribute of specified type from StateSet.*/
void removeAttribute(StateAttribute::Type type, unsigned int member=0); void removeAttribute(StateAttribute::Type type, unsigned int member=0);