From 1caa2765312af1fe9cc93676bae3d48aa44f2f0c Mon Sep 17 00:00:00 2001 From: Alibek Omarov Date: Sat, 25 Mar 2023 06:58:03 +0300 Subject: [PATCH] engine: common: imagelib: fix loading cubemaps Loop break was a bug that was added after refactoring imagelib loader. In fact, it was mindlessly copypasted from old code, where same break was used to quickly exit from inner format bruteforcing loop, than outer cubemap loading loop. --- engine/common/imagelib/img_main.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/engine/common/imagelib/img_main.c b/engine/common/imagelib/img_main.c index dbdfb7e4..11d8d51d 100644 --- a/engine/common/imagelib/img_main.c +++ b/engine/common/imagelib/img_main.c @@ -321,10 +321,9 @@ rgbdata_t *FS_LoadImage( const char *filename, const byte *buffer, size_t size ) { for( i = 0; i < 6; i++ ) { - if( Image_ProbeLoad( extfmt, loadname, cmap->type[i].suf, cmap->type[i].hint ) && - FS_AddSideToPack( cmap->type[i].flags )) // process flags to flip some sides + if( Image_ProbeLoad( extfmt, loadname, cmap->type[i].suf, cmap->type[i].hint )) { - break; + FS_AddSideToPack( cmap->type[i].flags ); } if( image.num_sides != i + 1 ) // check side @@ -339,7 +338,7 @@ rgbdata_t *FS_LoadImage( const char *filename, const byte *buffer, size_t size ) } } - // make sure what all sides is loaded + // make sure that all sides is loaded if( image.num_sides != 6 ) { // unexpected errors ?