Changed: #825 Remove all warning when compiling Ryzom
This commit is contained in:
parent
411405feb5
commit
f63cf62f19
2 changed files with 2 additions and 2 deletions
|
@ -843,7 +843,7 @@ bool ShapesExporter::renderPS(UInstance &entity, const string &output_path, doub
|
||||||
if(!saveOneImage(filename))
|
if(!saveOneImage(filename))
|
||||||
return false;
|
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;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -208,7 +208,7 @@ const std::string TileInfo::getRelativeFileName (TileTexture texture, int index)
|
||||||
{
|
{
|
||||||
nlassert(this->tileType != UnSet);
|
nlassert(this->tileType != UnSet);
|
||||||
|
|
||||||
std::string currentPath = "";
|
std::string currentPath;
|
||||||
if (tileType != Displace)
|
if (tileType != Displace)
|
||||||
{
|
{
|
||||||
currentPath = tileBankBrowser.getTile(index)->getRelativeFileName ((CTile::TBitmap)texture);
|
currentPath = tileBankBrowser.getTile(index)->getRelativeFileName ((CTile::TBitmap)texture);
|
||||||
|
|
Loading…
Reference in a new issue