Merge with develop

--HG--
branch : compatibility-develop
hg/compatibility-develop
Nimetu 7 years ago
commit 531b07db69

@ -3059,6 +3059,7 @@ void CEntityCL::updateVisiblePostPos(const NLMISC::TTime &/* currentTimeInMs */,
if (!instance.empty())
{
_SelectionFX.cast (instance);
_SelectionFX.setLoadBalancingGroup("SelectionFx");
if (_SelectionFX.empty())
{
// shape found, but not a particle system
@ -3087,6 +3088,7 @@ void CEntityCL::updateVisiblePostPos(const NLMISC::TTime &/* currentTimeInMs */,
if (!instance.empty())
{
_MouseOverFX.cast (instance);
_MouseOverFX.setLoadBalancingGroup("SelectionFx");
if (_MouseOverFX.empty())
{
// shape found, but not a particle system

@ -593,6 +593,8 @@ void initMainLoop()
Scene->setGroupLoadMaxPolygon("Skin", ClientCfg.SkinNbMaxPoly);
Scene->setGroupLoadMaxPolygon("Fx", ClientCfg.FxNbMaxPoly);
Scene->setMaxSkeletonsInNotCLodForm(ClientCfg.NbMaxSkeletonNotCLod);
// separate group for mouse/target selection reticle
Scene->setGroupLoadMaxPolygon("SelectionFx", 10000);
// enable Scene Lighting
Scene->enableLightingSystem(true);
Scene->setAmbientGlobal(CRGBA::Black);

Loading…
Cancel
Save