From fc19c842cf1356906a490d82e4759817f82b1a27 Mon Sep 17 00:00:00 2001 From: Bret Curtis Date: Thu, 13 Dec 2018 20:09:46 +0100 Subject: [PATCH] Revert "fix a rig bug visible with OSG_VERTEX_BUFFER_HINT=VAO" --- components/sceneutil/morphgeometry.cpp | 1 - components/sceneutil/riggeometry.cpp | 1 - 2 files changed, 2 deletions(-) diff --git a/components/sceneutil/morphgeometry.cpp b/components/sceneutil/morphgeometry.cpp index 18b9dc1fde..1b7e4ca93e 100644 --- a/components/sceneutil/morphgeometry.cpp +++ b/components/sceneutil/morphgeometry.cpp @@ -30,7 +30,6 @@ void MorphGeometry::setSourceGeometry(osg::ref_ptr sourceGeom) for (unsigned int i=0; i<2; ++i) { mGeometry[i] = new osg::Geometry(*mSourceGeometry, osg::CopyOp::SHALLOW_COPY); - mGeometry[i]->setDataVariance(osg::Object::DYNAMIC); const osg::Geometry& from = *mSourceGeometry; osg::Geometry& to = *mGeometry[i]; diff --git a/components/sceneutil/riggeometry.cpp b/components/sceneutil/riggeometry.cpp index 73d05a292f..30a3f076cf 100644 --- a/components/sceneutil/riggeometry.cpp +++ b/components/sceneutil/riggeometry.cpp @@ -63,7 +63,6 @@ void RigGeometry::setSourceGeometry(osg::ref_ptr sourceGeometry) { const osg::Geometry& from = *sourceGeometry; mGeometry[i] = new osg::Geometry(from, osg::CopyOp::SHALLOW_COPY); - mGeometry[i]->setDataVariance(osg::Object::DYNAMIC); osg::Geometry& to = *mGeometry[i]; to.setSupportsDisplayList(false); to.setUseVertexBufferObjects(true);