From d79e04e4dd9ce0aee19b43973a627c70103522ef Mon Sep 17 00:00:00 2001 From: kaetemi Date: Thu, 28 Jun 2012 11:30:58 +0200 Subject: [PATCH 1/3] Fixed: Valgrind warnings --- code/nel/src/3d/render_trav.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/code/nel/src/3d/render_trav.cpp b/code/nel/src/3d/render_trav.cpp index a8965f60e..5cf6fd20e 100644 --- a/code/nel/src/3d/render_trav.cpp +++ b/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 From 0e1d8836a783bb67ed745349f6a13cd1f3107526 Mon Sep 17 00:00:00 2001 From: kervala Date: Fri, 20 Jul 2012 18:51:50 +0200 Subject: [PATCH 2/3] Fixed: Bad path in ryzom.desktop.in --- code/ryzom/client/unix/ryzom.desktop.in | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/code/ryzom/client/unix/ryzom.desktop.in b/code/ryzom/client/unix/ryzom.desktop.in index ded90c67f..6c967a61c 100644 --- a/code/ryzom/client/unix/ryzom.desktop.in +++ b/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 From 1d35fd5b7b2584e49e6e805f12047f3c10f22b77 Mon Sep 17 00:00:00 2001 From: sfb Date: Mon, 23 Jul 2012 12:26:38 -0500 Subject: [PATCH 3/3] Additional build path ignore. --- .hgignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgignore b/.hgignore index 1fbad60fd..6f730f76e 100644 --- a/.hgignore +++ b/.hgignore @@ -153,6 +153,7 @@ code/nelns/build/* code/snowballs/build/* code/ryzom/build/* code/build/* +code/build-2010/* build/* install/*