Hi Julian, I haven't done a review yet but will do after lunch. Is there any gotcha's I should be looking out for when merging?
Thoughts on attempt to pull in the changes from your git repository rather than zip? Are there particular commits that I'd need to pull in to do this? Robert. On 23 June 2016 at 16:52, Julien Valentin <[email protected]> wrote: > Hi Robert > I make a quick review of the diffs with git master and there are not drastic > https://github.com/openscenegraph/OpenSceneGraph/compare/master...mp3butcher:master > It seams your fixes have been taken into account. > I will try to see what Coverity says... > I attach the minimum file changes (my last submission was mailny copy/paste) > > > > robertosfield wrote: >> Hi Julian (and Cedric), >> >> I am happy to update but we need to make sure any bug fixes to >> osgAnimation in the core OSG have also been integrated with Cedric's >> version. I have recently made a number of fixes to clean up defects >> reported by Coverity Scan so would rather not loose all these. >> >> Perhaps the best way would be for Cedric to cherry pick what he feels >> are appropriate changes into his osgAnimation then for us to pull this >> in wholesale. I don't know if Cedric would have time look at the >> Coverity Scan results but what would ideal for me would be to have >> Cedric's version of osgAnimation have all the bug fixes and fixes to >> the Coverity defects in then we just pull in this so the two are then >> perfectly in sync. >> >> Cheers, >> Robert. >> >> On 23 June 2016 at 16:00, Julien Valentin <> wrote: >> >> > Hi, >> > I noticed that osganimation is not up to date in comparison with Cedric >> > Pinson's repo (and hardware model have bug). >> > I copy/paste it and made implied changes in osgdbFBX >> > Do you have any objection to this merge? >> > >> > Thank you! >> > >> > Cheers, >> > Julien >> > >> > ------------------ >> > Read this topic online here: >> > http://forum.openscenegraph.org/viewtopic.php?p=67755#67755 >> > >> > >> > >> > >> > _______________________________________________ >> > osg-submissions mailing list >> > >> > http://lists.openscenegraph.org/listinfo.cgi/osg-submissions-openscenegraph.org >> > >> > >> _______________________________________________ >> osg-submissions mailing list >> >> http://lists.openscenegraph.org/listinfo.cgi/osg-submissions-openscenegraph.org >> >> ------------------ >> Post generated by Mail2Forum > > > ------------------ > Read this topic online here: > http://forum.openscenegraph.org/viewtopic.php?p=67760#67760 > > > > > _______________________________________________ > 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
