diff --git a/CMakeLists.txt b/CMakeLists.txt index eb9dbc490..e793049d8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,7 +9,7 @@ SET(OPENSCENEGRAPH_SOVERSION 157) # set to 0 when not a release candidate, non zero means that any generated # git tags will be treated as release candidates of given number -SET(OPENSCENEGRAPH_RELEASE_CANDIDATE 1) +SET(OPENSCENEGRAPH_RELEASE_CANDIDATE 2) set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS TRUE) set_property(GLOBAL PROPERTY USE_FOLDERS ON) diff --git a/ChangeLog b/ChangeLog index 4f738f9a3..76136cc74 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,35 @@ +Wed, 27 Jun 2018 09:06:58 +0100 +Author : Robert Osfield +Fixed relaseGLObjects() calls + +Tue, 26 Jun 2018 20:50:55 +0100 +Author : Robert Osfield +Merge branch 'OpenSceneGraph-3.6' of https://github.com/openscenegraph/OpenSceneGraph into OpenSceneGraph-3.6 + +Tue, 26 Jun 2018 20:46:49 +0100 +Author : Robert Osfield +Replaced creation of a temporary Settings object on the heap with creation on the stack to improve performance + +Tue, 26 Jun 2018 20:17:07 +0100 +Author : OpenSceneGraph git repository +Merge pull request #566 from emminizer/fix-gl_rb-in-gluscaleimageGL_RG is now a supported format in gluScaleImage(). + +Tue, 26 Jun 2018 20:10:51 +0100 +Author : Robert Osfield +Added GLExtensions::isPointSpriteModeSupported to allow it to be enable for GL versions that support GL_POINT_SPRITE_ARB/GL_POINT_SPRITE_OES + +Tue, 26 Jun 2018 14:44:34 -0400 +Author : Daniel Emminizer +GL_RG is now a support format in gluScaleImage(). + +Mon, 25 Jun 2018 20:02:30 +0100 +Author : Robert Osfield +Moved osg::clampProjectionMatrix() template from CullVisitor.cpp into include/osg/CullSettings to make it easier to implement custom clampProjectionMatrix callbacks + +Wed, 20 Jun 2018 13:59:10 +0100 +Author : Robert Osfield +Updates for 3.6.2-rc1 + Tue, 19 Jun 2018 17:09:56 +0100 Author : Calum Robinson Fix z near calculation for lines diff --git a/README.md b/README.md index 3324dea2c..2e2035546 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ If details below are not sufficient then head over to the openscenegraph.org to Robert Osfield. Project Lead. -20th June 2018. +27th June 2018. ---