Merge branch 'ryzom/ui/improvements' into yubo

fix_opengl_on_mac
Ulukyn 5 years ago
commit 47dc707c91

@ -1748,7 +1748,7 @@ void CVegetableManager::swapIgRdrPassHardMode(CVegetableInstanceGroup *ig, uin
// ***************************************************************************
void CVegetableManager::setGlobalDensity(float density)
{
clamp(density, 0.f, 1.f);
clamp(density, 0.f, 100.f);
_GlobalDensity= density;
}

@ -5847,7 +5847,7 @@ void CCharacterCL::animEventsProcessing(double startTime, double stopTime)
}
// Sound Process.
CSoundAnimManager* sndMngr = CSoundAnimManager::instance();
if(sndMngr && (_SoundId[MOVE] != CSoundAnimationNoId))
if(_SoundContext.Args[2] != 999 && sndMngr && (_SoundId[MOVE] != CSoundAnimationNoId))
{
_SoundContext.Position = pos();
// Look for the cluster(s) containing this character...

Loading…
Cancel
Save