From 61b62360caf433de74cbfb7934c9da5a2d5d9b95 Mon Sep 17 00:00:00 2001
From: kervala <none@none>
Date: Sun, 24 Oct 2010 22:31:10 +0200
Subject: [PATCH] Changed: #825 Remove all warning when compiling Ryzom

---
 code/nel/tools/3d/shapes_exporter/shapes_exporter.cpp | 2 +-
 code/nel/tools/3d/tile_edit_qt/browser_model.cpp      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/nel/tools/3d/shapes_exporter/shapes_exporter.cpp b/code/nel/tools/3d/shapes_exporter/shapes_exporter.cpp
index 6abfe682b..a9cff1fc1 100644
--- a/code/nel/tools/3d/shapes_exporter/shapes_exporter.cpp
+++ b/code/nel/tools/3d/shapes_exporter/shapes_exporter.cpp
@@ -843,7 +843,7 @@ bool ShapesExporter::renderPS(UInstance &entity, const string &output_path, doub
 			if(!saveOneImage(filename))
 				return false;
 		}
-		if(time >= 30.0 || nbparticle == 0 && startTime > 0.0f || duration != 0.0f && time > duration)
+		if(time >= 30.0 || (nbparticle == 0 && startTime > 0.0f) || (duration != 0.0f && time > duration))
 			break;
 	}
 
diff --git a/code/nel/tools/3d/tile_edit_qt/browser_model.cpp b/code/nel/tools/3d/tile_edit_qt/browser_model.cpp
index 55f2b33cf..a70966106 100644
--- a/code/nel/tools/3d/tile_edit_qt/browser_model.cpp
+++ b/code/nel/tools/3d/tile_edit_qt/browser_model.cpp
@@ -208,7 +208,7 @@ const std::string TileInfo::getRelativeFileName (TileTexture texture, int index)
 {
 	nlassert(this->tileType != UnSet);
 
-	std::string currentPath = "";
+	std::string currentPath;
 	if (tileType != Displace)
 	{
 		currentPath = tileBankBrowser.getTile(index)->getRelativeFileName ((CTile::TBitmap)texture);