From 30b101b1756ca65aa3983b39f39b38baf85e3aae Mon Sep 17 00:00:00 2001 From: scrawl Date: Fri, 3 Feb 2017 06:44:14 +0100 Subject: [PATCH] Fix build error in OSG_USE_FLOAT_MATRIX=OFF mode due to a double implicit conversion to double (pun doubly intended) --- components/sceneutil/riggeometry.cpp | 4 ++-- components/sceneutil/riggeometry.hpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/components/sceneutil/riggeometry.cpp b/components/sceneutil/riggeometry.cpp index 2ad28affc..ba779df3e 100644 --- a/components/sceneutil/riggeometry.cpp +++ b/components/sceneutil/riggeometry.cpp @@ -337,7 +337,7 @@ void RigGeometry::updateBounds(osg::NodeVisitor *nv) void RigGeometry::updateGeomToSkelMatrix(const osg::NodePath& nodePath) { bool foundSkel = false; - osg::ref_ptr geomToSkelMatrix; + osg::ref_ptr 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); } } diff --git a/components/sceneutil/riggeometry.hpp b/components/sceneutil/riggeometry.hpp index 83fd562de..39829bcb0 100644 --- a/components/sceneutil/riggeometry.hpp +++ b/components/sceneutil/riggeometry.hpp @@ -56,7 +56,7 @@ namespace SceneUtil osg::ref_ptr mSourceTangents; Skeleton* mSkeleton; - osg::ref_ptr mGeomToSkelMatrix; + osg::ref_ptr mGeomToSkelMatrix; osg::ref_ptr mInfluenceMap;