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

Corrected the Subload::generateTextureObject() return type to make it consistent with Texture::generateTextureObject(..)

Browse Source 
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@15117 16af8721-9629-0410-8352-f15c8da7e697
This commit is contained in:
Robert Osfield
2015-08-14 15:25:08 +00:00
parent 051ee49098
commit 0532c93c8c
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/osg/Texture2D
View File

@@ -93,9 +93,9 @@ class OSG_EXPORT Texture2D : public Texture
return texture.textureObjectValid(state);
}
virtual TextureObject* generateTextureObject(const Texture2D& texture, State& state) const
virtual osg::ref_ptr<TextureObject> generateTextureObject(const Texture2D& texture, State& state) const
{
return osg::Texture::generateTextureObject(&texture, state.getContextID(), GL_TEXTURE_2D).release();
return osg::Texture::generateTextureObject(&texture, state.getContextID(), GL_TEXTURE_2D);
}
virtual void load(const Texture2D& texture,State& state) const = 0;

3
src/osg/Texture2D.cpp
View File

@@ -220,7 +220,8 @@ void Texture2D::apply(State& state) const
}
else if (_subloadCallback.valid())
{
_textureObjectBuffer[contextID] = textureObject = _subloadCallback->generateTextureObject(*this, state);
_textureObjectBuffer[contextID] = _subloadCallback->generateTextureObject(*this, state);
textureObject = _textureObjectBuffer[contextID].get();
textureObject->bind();