diff --git a/src/osgPlugins/dae/daeRAnimations.cpp b/src/osgPlugins/dae/daeRAnimations.cpp index 63ef93382..cda238b84 100644 --- a/src/osgPlugins/dae/daeRAnimations.cpp +++ b/src/osgPlugins/dae/daeRAnimations.cpp @@ -467,14 +467,14 @@ void daeReader::processAnimationMap(const TargetChannelPartMap& tcm, osgAnimatio else if (MatrixCubicBezierKeyframeContainer* cbkfCntr = dynamic_cast(channelPart->keyframes.get())) { - osgAnimation::MatrixKeyframeContainer* kfCntr = new osgAnimation::MatrixKeyframeContainer; + osgAnimation::MatrixKeyframeContainer* cbCntr = new osgAnimation::MatrixKeyframeContainer; for (size_t i = 0; i < cbkfCntr->size(); ++i) { const MatrixCubicBezierKeyframe& cbkf = cbkfCntr->at(i); - kfCntr->push_back(osgAnimation::MatrixKeyframe(cbkf.getTime(), cbkf.getValue().getPosition())); + cbCntr->push_back(osgAnimation::MatrixKeyframe(cbkf.getTime(), cbkf.getValue().getPosition())); } osgAnimation::MatrixLinearChannel* channel = new osgAnimation::MatrixLinearChannel; - channel->getOrCreateSampler()->setKeyframeContainer(kfCntr); + channel->getOrCreateSampler()->setKeyframeContainer(cbCntr); pOsgAnimationChannel = channel; } } diff --git a/src/osgPlugins/dae/daeReader.cpp b/src/osgPlugins/dae/daeReader.cpp index e7dbe956e..282389fd0 100644 --- a/src/osgPlugins/dae/daeReader.cpp +++ b/src/osgPlugins/dae/daeReader.cpp @@ -185,9 +185,9 @@ bool daeReader::processDocument( const std::string& fileURI) // identify every node as a joint, making it meaningless. std::vector instanceControllers; database->typeLookup(instanceControllers); - for (size_t i = 0; i < instanceControllers.size(); ++i) + for (size_t controller = 0; controller < instanceControllers.size(); ++controller) { - domInstance_controller* pInstanceController = instanceControllers[i]; + domInstance_controller* pInstanceController = instanceControllers[controller]; domController *pDomController = daeSafeCast(getElementFromURI(pInstanceController->getUrl())); if (!pDomController)