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

Merge pull request #693 from LaurensVoerman/glObj_C4250

Browse Source 
fix MSVC warning C4250: inherits 'X' via dominance (94x)
This commit is contained in:
OpenSceneGraph git repository
2019-01-17 17:24:22 +00:00
committed by GitHub
parent f223fec92d 2e29085669
commit 2e68db5b55
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/osgViewer/Viewer
View File

@@ -114,8 +114,8 @@ class OSGVIEWER_EXPORT Viewer : public ViewerBase, public osgViewer::View
virtual void getUsage(osg::ApplicationUsage& usage) const;
// ensure that osg::View provides the reiszerGLObjects and releaseGLObjects methods
using osg::View::resizeGLObjectBuffers;
using osg::View::releaseGLObjects;
virtual void resizeGLObjectBuffers(unsigned int maxSize) { osg::View::resizeGLObjectBuffers(maxSize); }
virtual void releaseGLObjects(osg::State* state = 0) const { osg::View::releaseGLObjects(state); }
protected: