diff options
| -rw-r--r-- | release/datafiles/splash.png | bin | 209995 -> 748407 bytes | |||
| -rw-r--r-- | release/datafiles/splash_2x.png | bin | 748407 -> 0 bytes | |||
| -rwxr-xr-x | release/datafiles/splash_scale.sh | 18 | ||||
| -rw-r--r-- | source/blender/editors/datafiles/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | source/blender/editors/include/ED_datafiles.h | 3 | ||||
| -rw-r--r-- | source/blender/windowmanager/intern/wm_splash_screen.c | 8 |
6 files changed, 4 insertions, 26 deletions
diff --git a/release/datafiles/splash.png b/release/datafiles/splash.png Binary files differindex 5dc54c8bd79..7f94a491469 100644 --- a/release/datafiles/splash.png +++ b/release/datafiles/splash.png diff --git a/release/datafiles/splash_2x.png b/release/datafiles/splash_2x.png Binary files differdeleted file mode 100644 index 7f94a491469..00000000000 --- a/release/datafiles/splash_2x.png +++ /dev/null diff --git a/release/datafiles/splash_scale.sh b/release/datafiles/splash_scale.sh deleted file mode 100755 index 8a3f2c6d1eb..00000000000 --- a/release/datafiles/splash_scale.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/bash - -# Use this script to generate splash.png from splash_2x.png. -# Supposed to give best quality image. -# -# Based on ImageMagic documentation, which is interesting -# to read anyway: -# -# http://www.imagemagick.org/Usage/filter -# http://www.imagemagick.org/Usage/filter/nicolas/ - -convert \ - splash_2x.png \ - -colorspace RGB \ - -filter Cosine \ - -resize 50% \ - -colorspace sRGB \ - splash.png diff --git a/source/blender/editors/datafiles/CMakeLists.txt b/source/blender/editors/datafiles/CMakeLists.txt index 1bc0465424d..3e9d2def78e 100644 --- a/source/blender/editors/datafiles/CMakeLists.txt +++ b/source/blender/editors/datafiles/CMakeLists.txt @@ -779,7 +779,6 @@ if(WITH_BLENDER) # images data_to_c_simple(../../../../release/datafiles/splash.png SRC) - data_to_c_simple(../../../../release/datafiles/splash_2x.png SRC) data_to_c_simple(../../../../release/datafiles/alert_icons.png SRC) # XXX These are handy, but give nasty "false changes" in svn :/ # svg_to_png(../../../../release/datafiles/blender_icons.svg diff --git a/source/blender/editors/include/ED_datafiles.h b/source/blender/editors/include/ED_datafiles.h index b6f9593c261..ad1cde5406d 100644 --- a/source/blender/editors/include/ED_datafiles.h +++ b/source/blender/editors/include/ED_datafiles.h @@ -54,9 +54,6 @@ extern char datatoc_alert_icons_png[]; extern int datatoc_splash_png_size; extern char datatoc_splash_png[]; -extern int datatoc_splash_2x_png_size; -extern char datatoc_splash_2x_png[]; - extern int datatoc_bfont_pfb_size; extern char datatoc_bfont_pfb[]; 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>"); } |
