Fix build error in OSG_USE_FLOAT_MATRIX=OFF mode due to a double implicit conversion to double (pun doubly intended)

pull/139/head
scrawl 8 years ago
parent 0be811c519
commit 30b101b175

@ -337,7 +337,7 @@ void RigGeometry::updateBounds(osg::NodeVisitor *nv)
void RigGeometry::updateGeomToSkelMatrix(const osg::NodePath& nodePath) void RigGeometry::updateGeomToSkelMatrix(const osg::NodePath& nodePath)
{ {
bool foundSkel = false; bool foundSkel = false;
osg::ref_ptr<osg::RefMatrixf> geomToSkelMatrix; osg::ref_ptr<osg::RefMatrix> geomToSkelMatrix;
for (osg::NodePath::const_iterator it = nodePath.begin(); it != nodePath.end(); ++it) for (osg::NodePath::const_iterator it = nodePath.begin(); it != nodePath.end(); ++it)
{ {
osg::Node* node = *it; osg::Node* node = *it;
@ -351,7 +351,7 @@ void RigGeometry::updateGeomToSkelMatrix(const osg::NodePath& nodePath)
if (osg::Transform* trans = node->asTransform()) if (osg::Transform* trans = node->asTransform())
{ {
if (!geomToSkelMatrix) if (!geomToSkelMatrix)
geomToSkelMatrix = new osg::RefMatrixf; geomToSkelMatrix = new osg::RefMatrix;
trans->computeWorldToLocalMatrix(*geomToSkelMatrix, NULL); trans->computeWorldToLocalMatrix(*geomToSkelMatrix, NULL);
} }
} }

@ -56,7 +56,7 @@ namespace SceneUtil
osg::ref_ptr<osg::Vec4Array> mSourceTangents; osg::ref_ptr<osg::Vec4Array> mSourceTangents;
Skeleton* mSkeleton; Skeleton* mSkeleton;
osg::ref_ptr<osg::RefMatrixf> mGeomToSkelMatrix; osg::ref_ptr<osg::RefMatrix> mGeomToSkelMatrix;
osg::ref_ptr<InfluenceMap> mInfluenceMap; osg::ref_ptr<InfluenceMap> mInfluenceMap;

Loading…
Cancel
Save