Merge branch 'minorfixes' into 'master'

Minor fixes

See merge request OpenMW/openmw!405

apps/openmw/mwmechanics/actors.cpp

@@ -1731,6 +1731,9 @@ namespace MWMechanics
 
     void Actors::predictAndAvoidCollisions()
     {
+        if (!MWBase::Environment::get().getMechanicsManager()->isAIActive())
+            return;
+
         const float minGap = 10.f;
         const float maxDistForPartialAvoiding = 200.f;
         const float maxDistForStrictAvoiding = 100.f;

components/nifosg/controller.hpp

@@ -83,7 +83,7 @@ namespace NifOsg
                 mLastLowKey = mKeys->mKeys.end();
                 mLastHighKey = mKeys->mKeys.end();
             }
-        };
+        }
 
         ValueInterpolator(std::shared_ptr<const MapT> keys, ValueT defaultVal = ValueT())
             : mKeys(keys)