mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-26 18:35:20 +00:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Marc Zinnschlag 2015-11-28 10:02:37 +01:00
commit 6facce9d13
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/openmw/mwrender/sky.cpp
View File

@ -1550,11 +1550,13 @@ void SkyManager::setWeather(const WeatherResult& weather)
{ {
mNextClouds = weather.mNextCloudTexture; 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, mCloudUpdater2->setTexture(mSceneManager->getTextureManager()->getTexture2D(texture,
osg::Texture::REPEAT, osg::Texture::REPEAT)); osg::Texture::REPEAT, osg::Texture::REPEAT));
}
} }
if (mCloudBlendFactor != weather.mCloudBlendFactor) if (mCloudBlendFactor != weather.mCloudBlendFactor)

3
apps/openmw/mwworld/weather.cpp
View File

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