Merge pull request #186 from OpenMW/master

Add OpenMW commits up to 15 Mar 2017

AUTHORS.md

@@ -22,6 +22,7 @@ Programmers
     Alexander Nadeau (wareya)
     Alexander Olofsson (Ace)
     Allofich
+    Andrei Kortunov (akortunov)
     AnyOldName3
     Aussiemon
     Austin Salgat (Salgat)

apps/openmw/mwgui/windowmanagerimp.cpp

@@ -1959,11 +1959,13 @@ namespace MWGui
 
     void WindowManager::cycleSpell(bool next)
     {
+        if (!isGuiMode())
             mSpellWindow->cycle(next);
     }
 
     void WindowManager::cycleWeapon(bool next)
     {
+        if (!isGuiMode())
             mInventoryWindow->cycle(next);
     }
 

components/sceneutil/optimizer.cpp

@@ -1057,7 +1057,7 @@ void Optimizer::MergeGeometryVisitor::checkAllowedToMerge()
     {
         osg::StateSet* stateSet = *it;
         osg::StateSet::RenderBinMode mode = stateSet->getRenderBinMode();
-        if (override && (!mode & osg::StateSet::PROTECTED_RENDERBIN_DETAILS))
+        if (override && !(mode & osg::StateSet::PROTECTED_RENDERBIN_DETAILS))
             continue;
         if (mode & osg::StateSet::USE_RENDERBIN_DETAILS)
             renderingHint = stateSet->getRenderingHint();

components/terrain/quadtreeworld.cpp

@@ -37,7 +37,7 @@ namespace
         return targetlevel;
     }
 
-    float distance(const osg::BoundingBox& box, const osg::Vec3f& v)
+    float distanceToBox(const osg::BoundingBox& box, const osg::Vec3f& v)
     {
         if (box.contains(v))
             return 0;
@@ -79,7 +79,7 @@ public:
 
     virtual bool isSufficientDetail(QuadTreeNode* node, const osg::Vec3f& eyePoint)
     {
-        float dist = distance(node->getBoundingBox(), eyePoint);
+        float dist = distanceToBox(node->getBoundingBox(), eyePoint);
         int nativeLodLevel = Log2(static_cast<unsigned int>(node->getSize()/mMinSize));
         int lodLevel = Log2(static_cast<unsigned int>(dist/(8192*mMinSize)));