Merge branch 'osganimation' into osganimation
This commit is contained in:
@@ -47,7 +47,7 @@ MorphGeometry::MorphGeometry(const osg::Geometry& g) :
|
||||
|
||||
MorphGeometry::MorphGeometry(const MorphGeometry& b, const osg::CopyOp& copyop) :
|
||||
osg::Geometry(b,copyop),
|
||||
_morphTransformImplementation((MorphTransform*)copyop(b._morphTransformImplementation)),
|
||||
_morphTransformImplementation(osg::clone(b._morphTransformImplementation.get(), copyop)),
|
||||
_dirty(b._dirty),
|
||||
_method(b._method),
|
||||
_morphTargets(b._morphTargets),
|
||||
|
||||
@@ -67,7 +67,7 @@ RigGeometry::RigGeometry()
|
||||
RigGeometry::RigGeometry(const RigGeometry& b, const osg::CopyOp& copyop) :
|
||||
osg::Geometry(b,copyop),
|
||||
_geometry(b._geometry),
|
||||
_rigTransformImplementation((RigTransform*)copyop(b._rigTransformImplementation)),
|
||||
_rigTransformImplementation(osg::clone(_rigTransformImplementation.get(), copyop)),
|
||||
_vertexInfluenceMap(b._vertexInfluenceMap),
|
||||
_needToComputeMatrix(b._needToComputeMatrix)
|
||||
{
|
||||
|
||||
@@ -289,6 +289,7 @@ void VertexInfluenceMap::removeUnexpressedBones(Skeleton &skel) const
|
||||
++ removed;
|
||||
OSG_INFO<<"removing useless bone: "<< bone2rm->getName() <<std::endl;
|
||||
osg::NodeList nodes;
|
||||
|
||||
for(unsigned int numchild = 0; numchild < bone2rm->getNumChildren(); numchild++)
|
||||
{
|
||||
if( (child = dynamic_cast<Bone*>(bone2rm->getChild(numchild))) )
|
||||
|
||||
Reference in New Issue
Block a user