diff options
author | psi29a <psi29a@gmail.com> | 2022-01-05 10:44:44 +0000 |
---|---|---|
committer | psi29a <psi29a@gmail.com> | 2022-01-05 10:44:44 +0000 |
commit | 8355153047c18774017ca3a174a4c04c29715095 (patch) | |
tree | 0bb5c29235323ec27a5160fc7dfd023d79ecd951 | |
parent | e0612db01cffc7fd84597397ca70cabf734e3bd0 (diff) | |
parent | 1a6be081499dd6006c5aa8cb4dc18ec36ed32772 (diff) |
Merge branch 'const_looop' into 'master'
Fix "warning: loop variable is copied but only used as const reference;...
See merge request OpenMW/openmw!1530
-rw-r--r-- | components/resource/scenemanager.cpp | 4 | ||||
-rw-r--r-- | components/sceneutil/mwshadowtechnique.cpp | 2 | ||||
-rw-r--r-- | components/sceneutil/osgacontroller.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/components/resource/scenemanager.cpp b/components/resource/scenemanager.cpp index 4f0658e033..41f65ba0ab 100644 --- a/components/resource/scenemanager.cpp +++ b/components/resource/scenemanager.cpp @@ -273,7 +273,7 @@ namespace Resource correct format for OpenMW: <Description>alphatest mode value MaterialName</Description> e.g <Description>alphatest GEQUAL 0.8 MyAlphaTestedMaterial</Description> */ std::vector<std::string> descriptions = node.getDescriptions(); - for (auto description : descriptions) + for (const auto & description : descriptions) { mDescriptions.emplace_back(description); } @@ -281,7 +281,7 @@ namespace Resource // Iterate each description, and see if the current node uses the specified material for alpha testing if (node.getStateSet()) { - for (auto description : mDescriptions) + for (const auto & description : mDescriptions) { std::vector<std::string> descriptionParts; std::istringstream descriptionStringStream(description); diff --git a/components/sceneutil/mwshadowtechnique.cpp b/components/sceneutil/mwshadowtechnique.cpp index daf6bb80ab..d56708e46c 100644 --- a/components/sceneutil/mwshadowtechnique.cpp +++ b/components/sceneutil/mwshadowtechnique.cpp @@ -1404,7 +1404,7 @@ void MWShadowTechnique::cull(osgUtil::CullVisitor& cv) std::string validRegionUniformName = "validRegionMatrix" + std::to_string(sm_i); osg::ref_ptr<osg::Uniform> validRegionUniform; - for (auto uniform : _uniforms[cv.getTraversalNumber() % 2]) + for (const auto & uniform : _uniforms[cv.getTraversalNumber() % 2]) { if (uniform->getName() == validRegionUniformName) validRegionUniform = uniform; diff --git a/components/sceneutil/osgacontroller.cpp b/components/sceneutil/osgacontroller.cpp index 520b2d177b..4d0f7a460a 100644 --- a/components/sceneutil/osgacontroller.cpp +++ b/components/sceneutil/osgacontroller.cpp @@ -33,7 +33,7 @@ namespace SceneUtil if (channelTargetName != umt->getName()) continue; // check if we can link a StackedTransformElement to the current Channel - for (auto stackedTransform : umt->getStackedTransforms()) + for (const auto & stackedTransform : umt->getStackedTransforms()) { osgAnimation::StackedTransformElement* element = stackedTransform.get(); if (element && !element->getName().empty() && channelName == element->getName()) |