mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-19 19:53:53 +00:00
Code Issues Releases Wiki Activity

Merge pull request #1030 from Aesylwinn/CoverityStuff

Browse source 
Fix some issues detected by coverity for the editor.
This commit is contained in:
scrawl 2016-08-19 01:07:14 +02:00 committed by GitHub
commit 51aa613848
3 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
apps/opencs/model/prefs/modifiersetting.cpp
View file

@ -15,6 +15,7 @@ namespace CSMPrefs
ModifierSetting::ModifierSetting(Category* parent, Settings::Manager* values, QMutex* mutex, const std::string& key,
const std::string& label)
: Setting(parent, values, mutex, key, label)
, mButton(0)
, mEditorActive(false)
{
}

1
apps/opencs/model/prefs/shortcutsetting.cpp
View file

@ -17,6 +17,7 @@ namespace CSMPrefs
ShortcutSetting::ShortcutSetting(Category* parent, Settings::Manager* values, QMutex* mutex, const std::string& key,
const std::string& label)
: Setting(parent, values, mutex, key, label)
, mButton(0)
, mEditorActive(false)
, mEditorPos(0)
{

4
apps/opencs/view/render/instancemode.cpp
View file

@ -74,6 +74,8 @@ osg::Vec3f CSVRender::InstanceMode::getSelectionCenter(const std::vector<osg::re
++objectCount;
}
}
if (objectCount > 0)
center /= objectCount;
return center;
@ -92,7 +94,7 @@ osg::Vec3f CSVRender::InstanceMode::getScreenCoords(const osg::Vec3f& pos)
CSVRender::InstanceMode::InstanceMode (WorldspaceWidget *worldspaceWidget, QWidget *parent)
: EditMode (worldspaceWidget, QIcon (":placeholder"), Mask_Reference, "Instance editing",
parent), mSubMode (0), mSubModeId ("move"), mSelectionMode (0), mDragMode (DragMode_None),
mDragAxis (-1), mLocked (false)
mDragAxis (-1), mLocked (false), mUnitScaleDist(1)
{
}