From Sukender, "I recently pulled from the GIT mirror and found that "OSG_USE_DEPRECATED_GEOMETRY_METHODS=OFF" hides a little mistake: there is a "#include <osg/Notify>" inside the "osg" namespace, in inlude/osg/Geometry.
"
This commit is contained in:
@@ -309,11 +309,14 @@ inline Geometry* createTexturedQuadGeometry(const Vec3& corner,const Vec3& width
|
||||
return createTexturedQuadGeometry(corner,widthVec,heightVec, 0.0f, 0.0f, s, t);
|
||||
}
|
||||
|
||||
} // namespace osg
|
||||
|
||||
#if defined(OSG_USE_DEPRECATED_GEOMETRY_METHODS)
|
||||
|
||||
#include <osg/Notify>
|
||||
|
||||
namespace osg {
|
||||
|
||||
inline void Geometry::setVertexIndices(IndexArray* array)
|
||||
{
|
||||
if (_vertexArray.valid()) { _vertexArray->setUserData(array); if (array) _containsDeprecatedData = true; }
|
||||
@@ -391,8 +394,9 @@ inline const IndexArray* Geometry::getVertexAttribIndices(unsigned int index) co
|
||||
if (index<_vertexAttribList.size() && _vertexAttribList[index].valid()) return dynamic_cast<IndexArray*>(_vertexAttribList[index]->getUserData());
|
||||
else return 0;
|
||||
}
|
||||
#endif
|
||||
|
||||
}
|
||||
} // namespace osg
|
||||
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user