krageon/openmw-tes3coop
1
0
Fork 0
forked from teamnwah/openmw-tes3coop
Code Issues Pull requests Releases Wiki Activity

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

Browse source
This commit is contained in:
scrawl 2017-02-03 06:44:14 +01:00
parent 0be811c519
commit 30b101b175
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
components/sceneutil/riggeometry.cpp
View file

@ -337,7 +337,7 @@ void RigGeometry::updateBounds(osg::NodeVisitor *nv)
void RigGeometry::updateGeomToSkelMatrix(const osg::NodePath& nodePath)
{
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)
{
osg::Node* node = *it;
@ -351,7 +351,7 @@ void RigGeometry::updateGeomToSkelMatrix(const osg::NodePath& nodePath)
if (osg::Transform* trans = node->asTransform())
{
if (!geomToSkelMatrix)
geomToSkelMatrix = new osg::RefMatrixf;
geomToSkelMatrix = new osg::RefMatrix;
trans->computeWorldToLocalMatrix(*geomToSkelMatrix, NULL);
}
}

2
components/sceneutil/riggeometry.hpp
View file

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