cpmadevs/cnq3
0
0
Fork 0
mirror of https://bitbucket.org/CPMADevs/cnq3 synced 2025-01-22 00:11:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

fixed developer warnings for image reuse with mixed settings

Browse source
This commit is contained in:
myT 2019-02-19 18:40:03 +01:00
parent 26ccc528d1
commit 7a83c0d6c4
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
code/renderer/tr_image.cpp
View file

@ -742,7 +742,7 @@ const image_t* R_FindImageFile( const char* name, int flags, int glWrapClampMode
if ( strcmp( name, image->name ) )
continue;
if ( strcmp( name, "*white" ) )
if ( !strcmp( name, "*white" ) )
return image;
// since this WASN'T enforced as an error, half the shaders out there (including most of id's)
@ -751,8 +751,8 @@ const image_t* R_FindImageFile( const char* name, int flags, int glWrapClampMode
if ( (image->flags & IMG_NOMIPMAP) != (flags & IMG_NOMIPMAP) ) {
ri.Printf( PRINT_DEVELOPER, "WARNING: reused image %s with mixed nomipmap settings\n", name );
}
if ( (image->flags & IMG_NOPICMIP) != (image->flags & IMG_NOPICMIP) ) {
ri.Printf( PRINT_DEVELOPER, "WARNING: reused image %s with mixed nomipmaps settings\n", name );
if ( (image->flags & IMG_NOPICMIP) != (flags & IMG_NOPICMIP) ) {
ri.Printf( PRINT_DEVELOPER, "WARNING: reused image %s with mixed nopicmip settings\n", name );
}
if ( image->wrapClampMode != glWrapClampMode ) {
ri.Printf( PRINT_DEVELOPER, "WARNING: reused image %s with mixed clamp settings (map vs clampMap)\n", name );