Merge remote-tracking branch 'origin/master'

apps/openmw/mwrender/sky.cpp

@@ -1550,11 +1550,13 @@ void SkyManager::setWeather(const WeatherResult& weather)
     {
         mNextClouds = weather.mNextCloudTexture;
 
-        std::string texture = Misc::ResourceHelpers::correctTexturePath(mNextClouds, mSceneManager->getVFS());
+        if (!mNextClouds.empty())
+        {
+            std::string texture = Misc::ResourceHelpers::correctTexturePath(mNextClouds, mSceneManager->getVFS());
 
-        if (!texture.empty())
             mCloudUpdater2->setTexture(mSceneManager->getTextureManager()->getTexture2D(texture,
                                                                                        osg::Texture::REPEAT, osg::Texture::REPEAT));
+        }
     }
 
     if (mCloudBlendFactor != weather.mCloudBlendFactor)

apps/openmw/mwworld/weather.cpp

@@ -158,6 +158,9 @@ Weather::Weather(const std::string& name,
     else
         mAmbientLoopSoundID = fallback.getFallbackString("Weather_" + name + "_Ambient_Loop_Sound_ID");
 
+    if (Misc::StringUtils::ciEqual(mAmbientLoopSoundID, "None"))
+        mAmbientLoopSoundID.clear();
+
     /*
     Unhandled:
     Rain Diameter=600 ?