Merged develop.

--HG--
branch : dfighter-tools

code/nel/tools/build_gamedata/processes/clodbank/0_setup.py

@@ -74,6 +74,8 @@ cfgOut.write("{\n")
 cfgOut.write("\t\"" + ExportBuildDirectory + "/" + ClodExportDirectory + "\", \n")
 cfgOut.write("\t\"" + ExportBuildDirectory + "/" + SkelExportDirectory + "\", \n")
 cfgOut.write("\t\"" + ExportBuildDirectory + "/" + AnimBuildDirectory + "\", \n")
+cfgOut.write("\t\"" + ExportBuildDirectory + "/" + ShapeOptimizedBuildDirectory + "\", \n")
+cfgOut.write("\t\"" + ExportBuildDirectory + "/" + ShapeWithCoarseMeshBuildDirectory + "\", \n")
 cfgOut.write("};\n")
 cfgOut.write("\n")
 cfgOut.close()

code/ryzom/tools/client/r2_islands_textures/screenshot_islands.cpp

@@ -1784,6 +1784,7 @@ void CScreenshotIslands::buildBackTextureHLS(const std::string & islandName, con
 
 
 	// keep more filled eighth of circle
+	nlassert(!sortedHLS.empty()); // If it crashes here, you may be missing .zonel's.
 	itHLS = sortedHLS.begin();
 	uint h, s, v;
 	RGB2HSV(*itHLS, h, s, v);

code/ryzom/tools/server/build_world_packed_col/build_world_packed_col.cpp

@@ -211,7 +211,7 @@ int main(int argc, char* argv[])
 			catch(const EStream &)
 			{
 				mustRebuild = true; // damaged file or bad version ? -> force rebuild
-				delete packedIsland; // remove whatever was serialized
+				// delete packedIsland; // remove whatever was serialized // NOPE. smart pointer
 				packedIsland = new CPackedWorldHolder;				
 			}
 		}