Archive/openmw
0
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-05-13 05:56:39 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

Merge pull request #2268 from akortunov/scanfix

Browse source 
Fix some issues from the Coverity Scan report
This commit is contained in:
Bret Curtis 2019-03-19 17:27:48 +01:00 • committed by GitHub
commit 26feedfcae
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 22 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

3
components/nifosg/controller.cpp
View file

@ -311,10 +311,11 @@ void VisController::operator() (osg::Node* node, osg::NodeVisitor* nv)
RollController::RollController(const Nif::NiFloatData *data)
: mData(data->mKeyList, 1.f)
, mStartingTime(0)
{
}
RollController::RollController()
RollController::RollController() : mStartingTime(0)
{
}

9
components/sceneutil/mwshadowtechnique.cpp
View file

@ -777,6 +777,7 @@ MWShadowTechnique::MWShadowTechnique(const MWShadowTechnique& vdsm, const osg::C
ShadowTechnique(vdsm,copyop)
{
_shadowRecievingPlaceholderStateSet = new osg::StateSet;
_enableShadows = vdsm._enableShadows;
}
MWShadowTechnique::~MWShadowTechnique()
@ -2011,18 +2012,20 @@ struct ConvexHull
Vertices unwantedEdgeEnds = findInternalEdges(vertex, connectedVertices);
for (auto edgeEnd : unwantedEdgeEnds)
{
for (auto itr = _edges.begin(); itr != _edges.end(); ++itr)
for (auto itr = _edges.begin(); itr != _edges.end();)
{
if (*itr == Edge(vertex, edgeEnd))
{
_edges.erase(itr);
itr = _edges.erase(itr);
break;
}
else if (*itr == Edge(edgeEnd, vertex))
{
_edges.erase(itr);
itr = _edges.erase(itr);
break;
}
else
++itr;
}
}
}