aleajactaest/khanat-opennel-code
1
0
Fork 0
mirror of https://port.numenaute.org/aleajactaest/khanat-opennel-code.git synced 2024-11-10 09:19:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Changed: Tga2dds tool no longer complains on every file that doesn't have _usercolor.

Browse source
This commit is contained in:
kaetemi 2010-05-29 13:42:57 +02:00
parent 6747a4b6f7
commit 6e714586fe
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
code/nel/tools/3d/tga_2_dds/tga2dds.cpp
View file

@ -19,7 +19,7 @@
#include "nel/misc/file.h" #include "nel/misc/file.h"
#include "nel/misc/bitmap.h" #include "nel/misc/bitmap.h"
#include "nel/misc/file.h" #include "nel/misc/path.h"
#include "nel/misc/debug.h" #include "nel/misc/debug.h"
#include <math.h> #include <math.h>
@ -352,6 +352,8 @@ void dividSize (CBitmap &bitmap)
// *************************************************************************** // ***************************************************************************
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
CApplicationContext applicationContext;
uint8 algo; uint8 algo;
// Parse Command Line. // Parse Command Line.
@ -495,9 +497,9 @@ int main(int argc, char **argv)
} }
// Reading second Tga for user color // Reading second Tga for user color, don't complain if _usercolor is missing
NLMISC::CIFile input2; NLMISC::CIFile input2;
if (input2.open(userColorFileName)) if (CPath::exists(userColorFileName) && input2.open(userColorFileName))
{ {
picTga2.load(input2); picTga2.load(input2);
uint32 height2 = picTga2.getHeight(); uint32 height2 = picTga2.getHeight();