]> git.xonotic.org Git - xonotic/darkplaces.git/commitdiff
In Q3 shader, generate white texture for *white too.
authorcloudwalk <cloudwalk@d7cf8633-e32d-0410-b094-e92efae38249>
Sat, 16 May 2020 19:55:55 +0000 (19:55 +0000)
committercloudwalk <cloudwalk@d7cf8633-e32d-0410-b094-e92efae38249>
Sat, 16 May 2020 19:55:55 +0000 (19:55 +0000)
This adds an extra strcmp to check for #white, and by extension, *white.

Patch contributed by Mario from Xonotic team.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12528 d7cf8633-e32d-0410-b094-e92efae38249

image.c

diff --git a/image.c b/image.c
index 2c8fb33231781e5f8ad05a09dae57492e4359db6..dec67c3b3609385cd01edcc3fb34fc87fcca78ec 100644 (file)
--- a/image.c
+++ b/image.c
@@ -2094,7 +2094,7 @@ unsigned char *Image_GetEmbeddedPicBGRA(const char *name)
                        return data;
                }
        }
-       if (!strcmp(name, "white"))
+       if (!strcmp(name, "white") || !strcmp(name, "#white"))
                return Image_GenerateWhite();
        if (!strcmp(name, "gfx/conchars"))
                return Image_GenerateConChars();