From d86dab2836892b884d784bb1b887ac3ad38e9d71 Mon Sep 17 00:00:00 2001 From: Cedric Pinson Date: Wed, 4 Aug 2010 08:35:49 +0000 Subject: [PATCH] From Rob Smith, makes hardware skinning use of the existing stateset --- src/osgAnimation/RigTransformHardware.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/osgAnimation/RigTransformHardware.cpp b/src/osgAnimation/RigTransformHardware.cpp index 98d374fcf..4158c1d46 100644 --- a/src/osgAnimation/RigTransformHardware.cpp +++ b/src/osgAnimation/RigTransformHardware.cpp @@ -255,11 +255,11 @@ bool RigTransformHardware::init(RigGeometry& geom) } program->addShader(_shader.get()); - osg::ref_ptr ss = new osg::StateSet; + osg::ref_ptr ss = geom.getOrCreateStateSet(); ss->addUniform(getMatrixPaletteUniform()); ss->addUniform(new osg::Uniform("nbBonesPerVertex", getNumBonesPerVertex())); ss->setAttributeAndModes(program.get()); - geom.setStateSet(ss.get()); + _needInit = false; return true; }