Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulian Eisel <julian@blender.org>2020-04-15 11:18:17 +0300
committerJulian Eisel <julian@blender.org>2020-04-15 12:49:25 +0300
commit69419b5f00c824fed05f411dbd9a34b37ead1bc2 (patch)
tree6baab5b5682a39673af68dc888e964c72cc08a05 /source/blender/windowmanager/intern/wm_splash_screen.c
parentad3bcee0817a2500a26f36bde51d99c505defc0d (diff)
Resources: Remove small splash screen image variant
After the previous commit by Harley Acheson, scaling can be handled at runtime so we don't need to have two splash screen image variants anymore. Also removes the `splash_scale.sh` script used to create the down-scaled variant. Always nice to get rid of some binary files from the repository :)
Diffstat (limited to 'source/blender/windowmanager/intern/wm_splash_screen.c')
-rw-r--r--source/blender/windowmanager/intern/wm_splash_screen.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/windowmanager/intern/wm_splash_screen.c b/source/blender/windowmanager/intern/wm_splash_screen.c
index 1f8a60250be..4cf6291c2e4 100644
--- a/source/blender/windowmanager/intern/wm_splash_screen.c
+++ b/source/blender/windowmanager/intern/wm_splash_screen.c
@@ -181,8 +181,8 @@ static void wm_block_splash_add_labels(uiBlock *block, int x, int y)
static ImBuf *wm_block_splash_image(void)
{
#ifndef WITH_HEADLESS
- extern char datatoc_splash_2x_png[];
- extern int datatoc_splash_2x_png_size;
+ extern char datatoc_splash_png[];
+ extern int datatoc_splash_png_size;
ImBuf *ibuf = NULL;
@@ -197,8 +197,8 @@ static ImBuf *wm_block_splash_image(void)
}
if (ibuf == NULL) {
- const uchar *splash_data = (const uchar *)datatoc_splash_2x_png;
- size_t splash_data_size = datatoc_splash_2x_png_size;
+ const uchar *splash_data = (const uchar *)datatoc_splash_png;
+ size_t splash_data_size = datatoc_splash_png_size;
ibuf = IMB_ibImageFromMemory(splash_data, splash_data_size, IB_rect, NULL, "<splash screen>");
}