Merge remote-tracking branch 'origin/master'

apps/openmw/mwsound/soundmanagerimp.cpp

@@ -612,7 +612,8 @@ namespace MWSound
 
     void SoundManager::stopSound(MWBase::SoundPtr sound)
     {
-        mOutput->stopSound(sound);
+        if (sound.get())
+            mOutput->stopSound(sound);
     }
 
     void SoundManager::stopSound3D(const MWWorld::Ptr &ptr, const std::string& soundId)

apps/openmw/mwsound/soundmanagerimp.hpp

@@ -201,6 +201,7 @@ namespace MWSound
 
         virtual void stopSound(MWBase::SoundPtr sound);
         ///< Stop the given sound from playing
+        /// @note no-op if \a sound is null
 
         virtual void stopSound3D(const MWWorld::Ptr &reference, const std::string& soundId);
         ///< Stop the given object from playing the given sound,

components/sceneutil/skeleton.cpp

@@ -3,6 +3,8 @@
 #include <osg/Transform>
 #include <osg/MatrixTransform>
 
+#include <components/misc/stringops.hpp>
+
 #include <iostream>
 
 namespace SceneUtil
@@ -23,7 +25,7 @@ public:
         if (!bone)
             return;
 
-        mCache[bone->getName()] = std::make_pair(getNodePath(), bone);
+        mCache[Misc::StringUtils::lowerCase(bone->getName())] = std::make_pair(getNodePath(), bone);
 
         traverse(node);
     }
@@ -59,7 +61,7 @@ Bone* Skeleton::getBone(const std::string &name)
         mBoneCacheInit = true;
     }
 
-    BoneCache::iterator found = mBoneCache.find(name);
+    BoneCache::iterator found = mBoneCache.find(Misc::StringUtils::lowerCase(name));
     if (found == mBoneCache.end())
         return NULL;