Hi Robert, Don't worry about the assertion you mentioned below: I was looking at the wrong branch, and it looks like your removal occurred within the same hour as my email. It was just a real-life race condition. :)
The code looks fine on my side. Fixes the immediate problem presented. So good so far on 3.6-TexStorage branch, running on win64 VC-14 (Visual Studio 2015). No issues seen yet. - Dan > -----Original Message----- > From: osg-users [mailto:[email protected]] On > Behalf Of Robert Osfield > Sent: Wednesday, August 22, 2018 9:29 AM > To: OpenSceneGraph Users > Subject: Re: [osg-users] Core Profile: glEnable/glDisable GL_POINT_SPRITE > > On Wed, 22 Aug 2018 at 12:54, Daniel Emminizer, Code 5773 > <[email protected]> wrote: > > It's on my list to swap over to 3.6-TexStorage to make sure it doesn't break > anything. I'll do that in the next couple of days and test this out. > > Thanks. > > > The change looked good from a quick review on 3.6 branch. But on master > branch you have "if (false)" around the code block. I'll point out on github > to > make it easier to find. Looks unintentional and does not match 3.6 branch. > > I'm a bit confused by this assertion as I don't see the if (false) in > the master branch. > > The if (false) was added to help test whether the GL warnings were > visible with/without the fix. I checked in removal of this. Master > shouldn't have this, and I removed this from the 3.6 and > 3.6-TexStorage where it was unintentionally checked in. > > Robert. > _______________________________________________ > osg-users mailing list > [email protected] > http://lists.openscenegraph.org/listinfo.cgi/osg-users-openscenegraph.org _______________________________________________ osg-users mailing list [email protected] http://lists.openscenegraph.org/listinfo.cgi/osg-users-openscenegraph.org
