mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-04-30 22:11:23 +00:00
Code Issues Releases Wiki Activity

Merge branch 'mmmmove' into 'master'

Browse source 
Sprinkle a couple of std::move

See merge request OpenMW/openmw!1147
This commit is contained in:
psi29a 2021-08-17 08:11:14 +00:00
commit 72fb3ad930
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
components/resource/keyframemanager.cpp
View file

@ -40,7 +40,7 @@ namespace Resource
} }
osg::ref_ptr<Resource::Animation> mergedAnimationTrack = new Resource::Animation; osg::ref_ptr<Resource::Animation> mergedAnimationTrack = new Resource::Animation;
std::string animationName = animation->getName(); const std::string animationName = animation->getName();
mergedAnimationTrack->setName(animationName); mergedAnimationTrack->setName(animationName);
const osgAnimation::ChannelList& channels = animation->getChannels(); const osgAnimation::ChannelList& channels = animation->getChannels();

2
components/sceneutil/mwshadowtechnique.cpp
View file

@ -2141,7 +2141,7 @@ struct ConvexHull
finalEdges.push_back(edge); finalEdges.push_back(edge);
} }
_edges = finalEdges; _edges = std::move(finalEdges);
} }
void transform(const osg::Matrixd& m) void transform(const osg::Matrixd& m)

2
components/sceneutil/shadowsbin.cpp
View file

@ -221,7 +221,7 @@ void ShadowsBin::sortImplementation()
} }
if (!noTestRoot->_leaves.empty()) if (!noTestRoot->_leaves.empty())
newList.push_back(noTestRoot); newList.push_back(noTestRoot);
_stateGraphList = newList; _stateGraphList = std::move(newList);
} }
} }