adrien/netradiant-custom
1
Fork 0
mirror of https://github.com/Garux/netradiant-custom.git synced 2026-09-28 00:00:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ingar/webp' into ingar/netradiant-ing

Browse Source
This commit is contained in:
Stijn Buys
2015-06-21 11:34:12 +02:00
parent 6e160dd8ea f240ae0145
commit 44631e2e8e
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/quake3/q3map2/image.c
+10 -10
View File
@@ -449,7 +449,7 @@ image_t *ImageLoad( const char *filename ){
LoadDDSBuffer( buffer, size, &image->pixels, &image->width, &image->height );
/* debug code */
#if 1
#if 0
{
ddsPF_t pf;
DDSGetInfo( (ddsBuffer_t*) buffer, NULL, NULL, &pf );
@@ -462,15 +462,15 @@ image_t *ImageLoad( const char *filename ){
}
#endif
}
}
else
{
/* attempt to load ktx */
StripExtension( name );
strcat( name, ".ktx" );
size = vfsLoadFile( (const char*) name, (void**) &buffer, 0 );
if ( size > 0 ) {
LoadKTXBufferFirstImage( buffer, size, &image->pixels, &image->width, &image->height );
else
{
/* attempt to load ktx */
StripExtension( name );
strcat( name, ".ktx" );
size = vfsLoadFile( (const char*) name, (void**) &buffer, 0 );
if ( size > 0 ) {
LoadKTXBufferFirstImage( buffer, size, &image->pixels, &image->width, &image->height );
}
}
}
}