diff --git a/AUTHORS.txt b/AUTHORS.txt index 04d27767a..58785217b 100644 --- a/AUTHORS.txt +++ b/AUTHORS.txt @@ -1,4 +1,4 @@ -OpenSceneGraph Library 3.3.9 +OpenSceneGraph Library 3.5.0 548 Contributors: @@ -57,11 +57,11 @@ Mathieu Marache Lionel Lagarde Jason Daly Art Tevs +Terry Welsh Philip Lowman Per Fahlberg Norman Vine Chris Denham -Terry Welsh Serge Lages Romano José Magacho da Silva Jannik Heller diff --git a/ChangeLog b/ChangeLog index 347d4111a..8f7a8b47e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,49 @@ +2015-07-14 08:25 robert + + * src/osg/StateSet.cpp: Added _defineList into the + osg::StateSet::compare() implementation to address issues with + osgUtil::Optimizer ignoring defines. + +2015-07-13 16:09 robert + + * include/osgText/Text, src/osgText/Text.cpp: Added + Text::GlyphQuads::release/resizeGLObjects() and handling of + inconsistent contextID sizes to avoid crashes when viewers and + scene graphs aren't initialized correctly to the right number of + contexts. + +2015-07-13 16:03 robert + + * src/osgViewer/CompositeViewer.cpp, src/osgViewer/Viewer.cpp, + src/osgViewer/ViewerBase.cpp: Standardize the call to + setUpThreading() in CompositeViewer/Viewer::realize(). + + Standardize the call to scene->resizeGLObjects(). + +2015-07-13 08:48 robert + + * include/osg/GLDefines: From Terry Welsh, "fThis fixes problem + where new glClipControl feature would not compile for GLES2 + profile" + +2015-07-03 06:51 robert + + * CMakeLists.txt: Updated version number to 3.5.0 after 3.4 branch. + +2015-07-03 06:28 robert + + * README.txt: Updated for 3.4 branch. + +2015-07-02 11:58 robert + + * src/osgPlugins/gdal/CMakeLists.txt: Fixed repeated name in + SETUP_PLUGIN. + +2015-07-02 10:25 robert + + * CMakeLists.txt, ChangeLog: Updated ChangeLog and AUTHORS file in + prep for 3.4 branch. + 2015-07-02 08:57 robert * src/osgPlugins/osgjs/JSON_Objects: Build fix