Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Merged develop.

Browse source 
--HG--
branch : dfighter-tools
This commit is contained in:
dfighter1985 2014-09-22 23:58:48 +02:00
commit 9b989a2dc0
3 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
code/nel/tools/build_gamedata/processes/clodbank/0_setup.py
View file

@ -74,6 +74,8 @@ cfgOut.write("{\n")
cfgOut.write("\t\"" + ExportBuildDirectory + "/" + ClodExportDirectory + "\", \n") cfgOut.write("\t\"" + ExportBuildDirectory + "/" + ClodExportDirectory + "\", \n")
cfgOut.write("\t\"" + ExportBuildDirectory + "/" + SkelExportDirectory + "\", \n") cfgOut.write("\t\"" + ExportBuildDirectory + "/" + SkelExportDirectory + "\", \n")
cfgOut.write("\t\"" + ExportBuildDirectory + "/" + AnimBuildDirectory + "\", \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.write("\n") cfgOut.write("\n")
cfgOut.close() cfgOut.close()

1
code/ryzom/tools/client/r2_islands_textures/screenshot_islands.cpp
View file

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

2
code/ryzom/tools/server/build_world_packed_col/build_world_packed_col.cpp
View file

@ -211,7 +211,7 @@ int main(int argc, char* argv[])
catch(const EStream &) catch(const EStream &)
{ {
mustRebuild = true; // damaged file or bad version ? -> force rebuild 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; packedIsland = new CPackedWorldHolder;
} }
} }