Merge remote-tracking branch 'upstream/master'

2017-08-15 22:15:31 +03:00
parent b0ef9b0c42 7b2dbc603c
commit 237ab29ff8
18 changed files with 260 additions and 115 deletions
--- a/examples/osgtext3D/osgtext3D.cpp
+++ b/examples/osgtext3D/osgtext3D.cpp
@@ -43,7 +43,7 @@ public:
    {
    }

-    virtual bool handle(const osgGA::GUIEventAdapter& ea, osgGA::GUIActionAdapter& aa)
+    virtual bool handle(const osgGA::GUIEventAdapter& ea, osgGA::GUIActionAdapter&)
    {
        if (ea.getEventType() == osgGA::GUIEventAdapter::KEYUP)
        {