forked from bartvdbraak/blender
Splash screen: use a retina resolution image for Mac OS X.
This commit is contained in:
parent
90a86fecee
commit
3f769776fe
@ -694,6 +694,7 @@ if B.targets != ['cudakernels']:
|
||||
data_to_c_simple("release/datafiles/bmonofont.ttf")
|
||||
|
||||
data_to_c_simple("release/datafiles/splash.png")
|
||||
data_to_c_simple("release/datafiles/splash_2x.png")
|
||||
|
||||
# data_to_c_simple("release/datafiles/blender_icons16.png")
|
||||
# data_to_c_simple("release/datafiles/blender_icons32.png")
|
||||
|
BIN
release/datafiles/splash_2x.png
Normal file
BIN
release/datafiles/splash_2x.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 685 KiB |
Binary file not shown.
@ -47,6 +47,7 @@ if(WITH_BLENDER)
|
||||
|
||||
# images
|
||||
data_to_c_simple(../../../../release/datafiles/splash.png SRC)
|
||||
data_to_c_simple(../../../../release/datafiles/splash_2x.png SRC)
|
||||
# XXX These are handy, but give nasty "false changes" in svn :/
|
||||
#svg_to_png(../../../../release/datafiles/blender_icons.svg
|
||||
#../../../../release/datafiles/blender_icons16.png
|
||||
|
@ -41,6 +41,7 @@ sources.extend((
|
||||
os.path.join(env['DATA_SOURCES'], "bmonofont.ttf.c"),
|
||||
|
||||
os.path.join(env['DATA_SOURCES'], "splash.png.c"),
|
||||
os.path.join(env['DATA_SOURCES'], "splash_2x.png.c"),
|
||||
os.path.join(env['DATA_SOURCES'], "blender_icons16.png.c"),
|
||||
os.path.join(env['DATA_SOURCES'], "blender_icons32.png.c"),
|
||||
os.path.join(env['DATA_SOURCES'], "prvicons.png.c"),
|
||||
|
@ -54,6 +54,9 @@ extern char datatoc_prvicons_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[];
|
||||
|
||||
|
@ -1767,8 +1767,19 @@ static uiBlock *wm_block_create_splash(bContext *C, ARegion *ar, void *UNUSED(ar
|
||||
extern char datatoc_splash_png[];
|
||||
extern int datatoc_splash_png_size;
|
||||
|
||||
ImBuf *ibuf = IMB_ibImageFromMemory((unsigned char *)datatoc_splash_png,
|
||||
extern char datatoc_splash_2x_png[];
|
||||
extern int datatoc_splash_2x_png_size;
|
||||
|
||||
ImBuf *ibuf;
|
||||
|
||||
if (U.pixelsize == 2) {
|
||||
ibuf = IMB_ibImageFromMemory((unsigned char *)datatoc_splash_2x_png,
|
||||
datatoc_splash_2x_png_size, IB_rect, NULL, "<splash screen>");
|
||||
}
|
||||
else {
|
||||
ibuf = IMB_ibImageFromMemory((unsigned char *)datatoc_splash_png,
|
||||
datatoc_splash_png_size, IB_rect, NULL, "<splash screen>");
|
||||
}
|
||||
#else
|
||||
ImBuf *ibuf = NULL;
|
||||
#endif
|
||||
|
Loading…
Reference in New Issue
Block a user