From 814a885a6c9ea6048824d5f0ebc8fc70c74059cd Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Tue, 11 Aug 2015 20:12:02 +0000 Subject: [PATCH] Updated ChangeLog and RC nubmer to 13, and added GL1 to the docs on the GL_PROFILE usage git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/branches/OpenSceneGraph-3.4@15098 16af8721-9629-0410-8352-f15c8da7e697 --- CMakeLists.txt | 4 ++-- ChangeLog | 23 +++++++++++++++++++++++ 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4490a09f4..fc3114f95 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -58,7 +58,7 @@ SET(OPENSCENEGRAPH_SOVERSION 130) # set to 0 when not a release candidate, non zero means that any generated # svn tags will be treated as release candidates of given number -SET(OPENSCENEGRAPH_RELEASE_CANDIDATE 12) +SET(OPENSCENEGRAPH_RELEASE_CANDIDATE 13) SET(OPENSCENEGRAPH_VERSION ${OPENSCENEGRAPH_MAJOR_VERSION}.${OPENSCENEGRAPH_MINOR_VERSION}.${OPENSCENEGRAPH_PATCH_VERSION}) @@ -402,7 +402,7 @@ OPTION(OSG_USE_REF_PTR_IMPLICIT_OUTPUT_CONVERSION "Set to ON to use the ref_ptr< # Map the OPENGL_PROFILE to OSG_GL*_AVAILABLE settings -SET(OPENGL_PROFILE "GL2" CACHE STRING "OpenGL Profile to use, choose from GL2, GL3, GLES1, GLES2, GLES3") +SET(OPENGL_PROFILE "GL2" CACHE STRING "OpenGL Profile to use, choose from GL1, GL2, GL3, GLES1, GLES2, GLES3") IF ((OPENGL_PROFILE STREQUAL "GL1") OR (OPENGL_PROFILE STREQUAL "GL2")) OPTION(OSG_GL1_AVAILABLE "Set to OFF to disable use of OpenGL 1.x functions library." ON ) diff --git a/ChangeLog b/ChangeLog index 493c82d47..1bbd9f422 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,26 @@ +2015-08-11 20:08 robert + + * src/osgVolume/Shaders/volume_frag.cpp, + src/osgVolume/Shaders/volume_iso_frag.cpp, + src/osgVolume/Shaders/volume_lit_frag.cpp, + src/osgVolume/Shaders/volume_lit_tf_frag.cpp, + src/osgVolume/Shaders/volume_mip_frag.cpp, + src/osgVolume/Shaders/volume_tf_frag.cpp, + src/osgVolume/Shaders/volume_tf_iso_frag.cpp, + src/osgVolume/Shaders/volume_tf_mip_frag.cpp: Refactored + workaround of NVidia nan length bug. + +2015-08-11 08:44 robert + + * CMakeLists.txt, CMakeModules/FindAsio.cmake, + CMakeModules/FindLIBLAS.cmake, src/osgPlugins/CMakeLists.txt: + Moved the FIND_PACKAGE(Boost) from the root CMakeLists.txt into + the local Find scripts to avoid Boost check when not neccessary. + +2015-08-10 19:58 robert + + * ChangeLog: Updated ChangeLog + 2015-08-10 19:56 robert * src/osg/State.cpp: From svn/trunk merged support for passing the