FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

From Cedric Pinson, remove unused file, fix crash for old files

Browse Source
This commit is contained in:
Cedric Pinson
2010-01-27 15:37:45 +00:00
parent 6af9f0819b
commit d730a6bdb5
6 changed files with 8 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/osgAnimation/RigTransformSoftware.cpp
View File

@@ -35,7 +35,8 @@ bool RigTransformSoftware::init(RigGeometry& geom)
BoneMap bm = mapVisitor.getBoneMap();
initVertexSetFromBones(bm, geom.getVertexInfluenceSet().getUniqVertexSetToBoneSetList());
geom.copyFrom(*geom.getSourceGeometry());
if (geom.getSourceGeometry())
geom.copyFrom(*geom.getSourceGeometry());
geom.setVertexArray(0);
geom.setNormalArray(0);
@@ -49,6 +50,10 @@ void RigTransformSoftware::operator()(RigGeometry& geom)
if (!init(geom))
return;
if (!geom.getSourceGeometry()) {
osg::notify(osg::WARN) << this << " RigTransformSoftware no source geometry found on RigGeometry" << std::endl;
return;
}
osg::Geometry& source = *geom.getSourceGeometry();
osg::Geometry& destination = geom;