diff --git a/AUTHORS.txt b/AUTHORS.txt index e1bc0d4fe..f497a98d1 100644 --- a/AUTHORS.txt +++ b/AUTHORS.txt @@ -1,6 +1,6 @@ OpenSceneGraph Library 3.3.8 -545 Contributors: +547 Contributors: Firstname Surname ----------------- @@ -60,10 +60,10 @@ Art Tevs Philip Lowman Per Fahlberg Norman Vine +Chris Denham Terry Welsh Serge Lages Romano José Magacho da Silva -Chris Denham Alberto Farre Torben Dannhauer Sherman Wilcox @@ -296,6 +296,7 @@ Guillaume Taze Guillaume Chouvenc Giuseppe Donvito Gill Peacegood +Giampaolo Viganò Gerrick Bivins George Tarantilis Ferdi Smit @@ -477,7 +478,6 @@ Gunter Huber Gregory Jaegy Graeme Harkness Gian Lorenzetto -Giampaolo Viganò George Papagiannakis Galen Faidley Frida Schlaug @@ -500,6 +500,7 @@ Duvan Cope Duncan Cavens Drew Whitehouse Douglas A. Pouk +Dmitriy Ogalcev Dean Iverson David Jung Danny Valente @@ -515,6 +516,7 @@ Christopher Blaesius Christopher Baker Christophe Herreman Christian Noon +Christian Kehl Christian Kaser Christian Ehrlicher Chris McGlone diff --git a/ChangeLog b/ChangeLog index a60a5924c..94d8c6a53 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,97 @@ +2015-05-05 11:05 robert + + * CMakeLists.txt: Changed the CMP0020 check to > 2.8.10 + Updated SO version number + +2015-04-30 14:04 robert + + * include/osg/GLDefines: From Christian Kehl, changes for making + osgAndroid working with GLES1 enabled + +2015-04-30 13:59 robert + + * src/osgViewer/GraphicsWindowWin32.cpp: From Dmitriy Ogalcev, fix + for crash when calling setCursor from a non GUI thread + +2015-04-28 16:12 robert + + * include/osgShadow/MinimalShadowMap, + src/osgShadow/MinimalShadowMap.cpp: Replaced attempt at passing + NULL Matrix with two specialized methods. + +2015-04-27 19:31 robert + + * include/osg/LineSegment, src/osg/LineSegment.cpp: Renamed + LineSegment::intersect(BoundingSphere/Box, double/float&, + double/float&) methods to + LineSegment::intersectAndComputeRations(..) to avoid confusion + with the change in convention for + the old intersect(BoundingBox&, float/double&, float/double&) + method as it was inconsitent with the rest of the OSG including + the intersect(BoundingSphere) method in how the ratio for the + second intersection was measure from - original from the end + point, but now made consistent with other places in the OSG so be + based on ration from start to end of segment. + +2015-04-23 14:44 robert + + * src/osgText/GlyphGeometry.cpp: Refactoring GlyphGeometry Boundary + class to facilate better bevel overlap detection + +2015-04-23 12:58 robert + + * examples/osgtext/osgtext.cpp: Comment out debug notification + +2015-04-23 09:49 robert + + * src/osgText/GlyphGeometry.cpp: Removed unused method + +2015-04-22 14:25 robert + + * src/osgPlugins/3ds/ReaderWriter3DS.cpp: From Giampaolo Vigano, + "please find attached a further fix for 3ds plugin: now + reflection map works also with transparent objects (I also + removed a redundant setting of BlendFunc)." + +2015-04-21 17:29 robert + + * src/osgPlugins/3ds/ReaderWriter3DS.cpp, + src/osgPlugins/3ds/lib3ds/lib3ds_util.c: From Chris Denham, "I + found a couple of memory leaks in 3DS reader plugin and I have + attached corrected files. I have attached an example 3DS file I + used to test the leaks/fixes using osgviewer for trunk at rev + [14853] and the tagged version 3.2.1. + + The first leak is in the lib3ds module (yeah, I know that + probably should be corrected at http://code.google.com/p/lib3ds/ + but I'm assuming that as no commits have happened there since + 2011 that it may be better to fix the copy we have in the OSG of + that project) The leak is caused by lib3d's use of realloc(ptr, + 0) to free up memory allocations, but realloc, when ptr==NULL + returns malloc(0) rather than NULL and thus leaks a zero byte + allocation. The solution here was to adjust the + 'lib3ds_util_reserve_array' function so that it realloc is not + used to release a NULL pointer. + + The second leak is in ReaderWriter3DS.cpp and arises when any of + the created StateSet objects added to the StateSetMap don't + subsequently get applied to a Node. The solution here was just to + simply use the osg::ref_ptr around the raw StateSet pointer that + was used in the locally defined StateSetInfo struct." + +2015-04-20 10:41 robert + + * AUTHORS.txt, ChangeLog, applications/osgversion/Contributors.cpp: + Updated AUTHORS + +2015-04-20 10:36 robert + + * examples/osgmanipulator/osgmanipulator.cpp: Build fix + +2015-04-20 10:19 robert + + * src/osgPlugins/3ds/ReaderWriter3DS.cpp: Build fix + 2015-04-20 09:39 robert * src/osg/State.cpp: Moved uniform substitution to infront of diff --git a/applications/osgversion/Contributors.cpp b/applications/osgversion/Contributors.cpp index 4846d5c8f..f1fc51d9e 100644 --- a/applications/osgversion/Contributors.cpp +++ b/applications/osgversion/Contributors.cpp @@ -481,7 +481,8 @@ TypoCorrection typoCorrections[] = {"Ravsel", "Rav¨elj"}, {"Ravselj", "Rav¨elj"}, {"Janik", "Jannik"}, - {"Viganò", "Viganò"} + {"Viganò", "Viganò"}, + {"Vigano", "Viganò"} };