Robert Osfield 7ba85b16db From Colin MacDonald, "The Optimizer Merge Geometry visitor is always merging geometries, ...

even if they have had DataVariance DYNAMIC explicitly specified.  Then
when an application attempts to dynamically update the geometry in the
frame loop the primitive sets and data arrays are no longer as
expected, leading to display and/or memory corruption.

Attached is a simple fix."

Note from Robert Osfield, tweaked Colin's changes so that it uses != DYNAMIC rather == STATIC in the additional test.

Merged from svn/trunk using:

   svn merge -r 10479:10480 http://www.openscenegraph.org/svn/osg/OpenSceneGraph/trunk/src/osgUtil/Optimizer.cpp

2009-07-16 11:09:16 +00:00

..

CMakeLists.txt

Reverted the changes for ill fated tweaks for Apple build

2008-04-24 11:34:43 +00:00

CubeMapGenerator.cpp

Updated copyright years.

2006-07-18 15:21:48 +00:00

CullVisitor.cpp

Warnings fixes for VS.

2009-02-02 20:35:19 +00:00

DelaunayTriangulator.cpp

Warnings fixes for VS.

2009-02-02 20:35:19 +00:00

DisplayRequirementsVisitor.cpp

From Andy Skinner, adding C includes to avoid issues when mixing C and C++ standard includes

2007-07-28 10:44:03 +00:00

DrawElementTypeSimplifier.cpp

From David Callu, further work in support of shapefile support in VirtualPlanetBuilder

2007-12-26 21:39:29 +00:00

EdgeCollector.cpp

Warnings fixes for VS.

2009-02-02 20:35:19 +00:00

GLObjectsVisitor.cpp

Merged from svn/trunk.

2009-06-02 09:15:03 +00:00

HalfWayMapGenerator.cpp

Updated copyright years.

2006-07-18 15:21:48 +00:00

HighlightMapGenerator.cpp

Updated copyright years.

2006-07-18 15:21:48 +00:00

IntersectionVisitor.cpp

Fixed IntersectionVisitor::accept(Camera) handling of relative Cameras.

2008-11-06 13:38:11 +00:00

IntersectVisitor.cpp

Warnings fixes for VS.

2009-02-02 20:35:19 +00:00

LineSegmentIntersector.cpp

Warnings fixes for VS.

2009-02-02 20:35:19 +00:00

Optimizer.cpp

From Colin MacDonald, "The Optimizer Merge Geometry visitor is always merging geometries,

2009-07-16 11:09:16 +00:00

PlaneIntersector.cpp

From Roland Smeenk, "Attached you will find a large set of small typo fixes (mainly in the comments)."

2007-12-10 17:30:18 +00:00

PolytopeIntersector.cpp

From Peter Hrenka, "Due to popular demand I would like to submit this

2007-12-08 16:37:05 +00:00

PositionalStateContainer.cpp

Updated copyright years.

2006-07-18 15:21:48 +00:00

RenderBin.cpp

Introduced depend_on template and usage in RenderBin.cpp's singleton to solve crash on exit in static builds.

2009-06-06 10:08:43 +00:00

RenderLeaf.cpp

Changed RenderLeaf and StateGraph so that they use ref_ptr<> by default for Drawable and StateSet.

2007-08-31 16:05:24 +00:00

RenderStage.cpp

Fixed glStencilMask setting.

2009-05-27 12:11:58 +00:00

ReversePrimitiveFunctor.cpp

From David Callu, further work in support of shapefile support in VirtualPlanetBuilder

2007-12-26 21:39:29 +00:00

SceneGraphBuilder.cpp

Various warning fixes

2008-10-27 13:09:43 +00:00

SceneView.cpp

Improved the handling of toggling of GL_LIGHTi modes when SceneView::setLightingMode() is toggled on/off.

2009-01-29 09:28:08 +00:00

Simplifier.cpp

Fixed warning

2009-02-03 17:11:54 +00:00

SmoothingVisitor.cpp

Updated copyright years.

2006-07-18 15:21:48 +00:00

StateGraph.cpp

Updated copyright years.

2006-07-18 15:21:48 +00:00

Statistics.cpp

From Eric Wing, pedantic warning fixes

2007-04-06 15:36:13 +00:00

TangentSpaceGenerator.cpp

Fixed the handle of triangle fan.

2007-04-06 19:51:20 +00:00

Tessellator.cpp

From Gordon Tomlinson, "Find enclosed fix for a leak in the Tessellator::reset(), were the new verts were not being deleted, only the container was

2008-11-21 11:52:48 +00:00

TransformAttributeFunctor.cpp

Updated copyright years.

2006-07-18 15:21:48 +00:00

TransformCallback.cpp

Added osg::FrameStamp::set/getSimulationTime().

2007-01-25 12:02:51 +00:00

TriStrip_graph_array.h

From Jean-Sebastien Guay, warning fixes.

2009-02-04 19:22:25 +00:00

TriStrip_heap_array.h

Added catch of erase of the last element of heap.

2005-11-15 14:25:03 +00:00

TriStrip_tri_stripper.cpp

Fixed warnigns

2007-09-13 10:38:38 +00:00

TriStrip_tri_stripper.h

Warning fixes

2009-02-03 15:28:53 +00:00

TriStripVisitor.cpp

Warnings fixes for VS.

2009-02-02 20:35:19 +00:00

UpdateVisitor.cpp

Updated copyright years.

2006-07-18 15:21:48 +00:00

Version.cpp

From David Callu, improved consistency of Version strings and add version support

2007-09-05 17:12:24 +00:00