Hi Jannik, I had a bash merging via a github. This worked so the change is now checked into master, but I'm by not entirely happy with the workflow.
As a general note I will need to gain experience with both github and git, perhaps evolve the approach to merging submissions over to time to better fit with my needs for keeping the OSG is a decent shape. As yet I don't have a clear path forward w.r.t pulling submissions from pull requests. Cheers, Robert. On 6 December 2015 at 17:28, Jannik Heller <[email protected]> wrote: > Hi Robert, > > This submission adds a check for the presence of occlusion query extensions > to osg::OcclusionQueryNode, to avoid crashes when occlusion queries are not > supported. > > Pull request: https://github.com/openscenegraph/osg/pull/51/files > OcclusionQueryNode.cpp file: (attached) > > Thank you! > > Cheers, > Jannik > > ------------------ > Read this topic online here: > http://forum.openscenegraph.org/viewtopic.php?p=65821#65821 > > > > > _______________________________________________ > osg-submissions mailing list > [email protected] > http://lists.openscenegraph.org/listinfo.cgi/osg-submissions-openscenegraph.org > _______________________________________________ osg-submissions mailing list [email protected] http://lists.openscenegraph.org/listinfo.cgi/osg-submissions-openscenegraph.org
