mirror of
https://gitlab.com/OpenMW/openmw.git
synced 2025-04-10 15:45:37 +00:00
Merge branch 'mmmmove' into 'master'
Sprinkle a couple of std::move See merge request OpenMW/openmw!1147
This commit is contained in:
commit
72fb3ad930
@ -40,7 +40,7 @@ namespace Resource
|
||||
}
|
||||
|
||||
osg::ref_ptr<Resource::Animation> mergedAnimationTrack = new Resource::Animation;
|
||||
std::string animationName = animation->getName();
|
||||
const std::string animationName = animation->getName();
|
||||
mergedAnimationTrack->setName(animationName);
|
||||
|
||||
const osgAnimation::ChannelList& channels = animation->getChannels();
|
||||
|
@ -2141,7 +2141,7 @@ struct ConvexHull
|
||||
finalEdges.push_back(edge);
|
||||
}
|
||||
|
||||
_edges = finalEdges;
|
||||
_edges = std::move(finalEdges);
|
||||
}
|
||||
|
||||
void transform(const osg::Matrixd& m)
|
||||
|
@ -221,7 +221,7 @@ void ShadowsBin::sortImplementation()
|
||||
}
|
||||
if (!noTestRoot->_leaves.empty())
|
||||
newList.push_back(noTestRoot);
|
||||
_stateGraphList = newList;
|
||||
_stateGraphList = std::move(newList);
|
||||
}
|
||||
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user