diff --git a/AUTHORS.txt b/AUTHORS.txt index c43e9870b..c127f6dec 100644 --- a/AUTHORS.txt +++ b/AUTHORS.txt @@ -88,11 +88,11 @@ David Spilling Daniel Sjölie Bryan Thrall Rafa Gaitan +Mike Connell Fabien Lavignotte Andreas Ekstrand Thomas Hogarth Riccardo Corsi -Mike Connell Melchior Franz Konstantin Matveyev Johannes Baeuerle diff --git a/ChangeLog b/ChangeLog index 0be57e062..027600967 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,30 @@ +2015-06-08 11:18 robert + + * include/osgDB/Options, src/osgDB/DatabasePager.cpp, + src/osgDB/Options.cpp: From Mike Connell, "Give ReadFileCallback + access to parent location : These small changes to the database + pager allow user code in the ReadFileCallback to safely determine + where the file being loaded is destined to be inserted into the + scenegraph. + " + +2015-06-08 10:20 robert + + * src/osgUtil/SceneView.cpp: Addressed race condition where + SceneView::setLightingMode() was setting a shread Master Camera's + StateSet. + +2015-06-07 11:13 robert + + * src/osgViewer/CompositeViewer.cpp, src/osgViewer/Viewer.cpp: + Fixed setReferenceTime() bug where a * eather than the correct / + was being used. Bug and fix suggested Benjamin Richter. + +2015-06-04 09:35 robert + + * AUTHORS.txt, ChangeLog, applications/osgversion/Contributors.cpp: + Updated AUTHORS for dev release + 2015-06-04 09:13 robert * src/osg/Transform.cpp: From Jannik Heller,