[Bf-blender-cvs] [69419b5f00c] master: Resources: Remove small splash screen image variant

[Julian Eisel]

Commit: 69419b5f00c824fed05f411dbd9a34b37ead1bc2
Author: Julian Eisel
Date:   Wed Apr 15 10:18:17 2020 +0200
Branches: master
https://developer.blender.org/rB69419b5f00c824fed05f411dbd9a34b37ead1bc2

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 :)

===================================================================

M	release/datafiles/splash.png
D	release/datafiles/splash_2x.png
D	release/datafiles/splash_scale.sh
M	source/blender/editors/datafiles/CMakeLists.txt
M	source/blender/editors/include/ED_datafiles.h
M	source/blender/windowmanager/intern/wm_splash_screen.c

===================================================================

diff --git a/release/datafiles/splash.png b/release/datafiles/splash.png
index 5dc54c8bd79..7f94a491469 100644
Binary files a/release/datafiles/splash.png and b/release/datafiles/splash.png differ
diff --git a/release/datafiles/splash_2x.png b/release/datafiles/splash_2x.png
deleted file mode 100644
index 7f94a491469..00000000000
Binary files a/release/datafiles/splash_2x.png and /dev/null differ
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>");
   }