fly/flightgear
1
0
Fork 0
Code Activity

Restore OSG 3.2 compilation support

Browse source
This commit is contained in:
James Turner 2017-12-05 21:39:30 +00:00
parent 3ffed7d867
commit ac50a3c7ed
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/GUI/CanvasWidget.cxx
View file

@ -27,6 +27,7 @@
#include <Scripting/NasalSys.hxx> #include <Scripting/NasalSys.hxx>
#include <osg/GLExtensions> #include <osg/GLExtensions>
#include <osg/Version>
#include <simgear/canvas/Canvas.hxx> #include <simgear/canvas/Canvas.hxx>
#include <simgear/canvas/events/MouseEvent.hxx> #include <simgear/canvas/events/MouseEvent.hxx>
@ -198,7 +199,12 @@ void CanvasWidget::setSize(int w, int h)
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
void CanvasWidget::draw(int dx, int dy) void CanvasWidget::draw(int dx, int dy)
{ {
osg::GLExtensions* extensions = osg::GLExtensions::Get(0, true); #if OSG_VERSION_LESS_THAN(3,4,0)
osg::Extensions* extensions = osg::getExtensions(0, true);
#else
osg::GLExtensions* extensions = osg::GLExtensions::Get(0, true);
#endif
glEnable(GL_TEXTURE_2D); glEnable(GL_TEXTURE_2D);
glEnable(GL_BLEND); glEnable(GL_BLEND);
extensions->glBlendFuncSeparate(GL_ONE, GL_ZERO, GL_ZERO, GL_ONE); extensions->glBlendFuncSeparate(GL_ONE, GL_ZERO, GL_ZERO, GL_ONE);