Merged: From default to build_pipeline_v3

--HG--
branch : build_pipeline_v3

code/nel/src/3d/render_trav.cpp

@@ -69,7 +69,6 @@ CRenderTrav::CRenderTrav()
 	_CurrentPassOpaque = true;
 
 	_CacheLightContribution= NULL;
-	_LastLocalAttenuation= false;
 
 	// Default light Setup.
 	LightingSystemEnabled= false;
@@ -624,7 +623,7 @@ void		CRenderTrav::changeLightSetup(CLightContribution	*lightContribution, bool
 	uint		i;
 
 	// if same lightContribution, no-op.
-	if(_CacheLightContribution == lightContribution &&  _LastLocalAttenuation == useLocalAttenuation)
+	if (_CacheLightContribution == lightContribution && (lightContribution == NULL || _LastLocalAttenuation == useLocalAttenuation))
 		return;
 	// else, must setup the lights into driver.
 	else

code/ryzom/client/unix/ryzom.desktop.in

@@ -3,11 +3,14 @@ Version=1.0
 Name=Ryzom
 Name[ru]=Ризом
 Type=Application
-GenericName=ryzom
+GenericName=Game client
 Comment=Ryzom client
 Comment[fr_FR]=Client Ryzom
-Exec=${RYZOM_BIN_PREFIX}/ryzom_client
+TryExec=${RYZOM_GAMES_PREFIX}/ryzom_client
+Exec=${RYZOM_GAMES_PREFIX}/ryzom_client
 Icon=ryzom
 Terminal=false
 Hidden=false
 Categories=Game;RolePlaying;
+StartupWMClass=ryzom
+X-AppInstall-Package=ryzom-client