diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2014-02-18 23:34:55 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2014-02-18 23:34:55 +0400 |
| commit | acecae86dc8d4e59d373c73fb6abbdc276a98896 (patch) | |
| tree | 9f9f2f6045110e1fb2bff353e9ca4eb11b57f45e /source/blender/windowmanager | |
| parent | a66236c8f93a56c77351a21fc2e1a4b57bc67486 (diff) | |
Fix windows build error in splash screen commit.
Diffstat (limited to 'source/blender/windowmanager')
| -rw-r--r-- | source/blender/windowmanager/intern/wm_operators.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c index a7d8cba4d20..b0e04894599 100644 --- a/source/blender/windowmanager/intern/wm_operators.c +++ b/source/blender/windowmanager/intern/wm_operators.c @@ -1769,22 +1769,11 @@ static uiBlock *wm_block_create_splash(bContext *C, ARegion *ar, void *UNUSED(ar 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 - #ifdef WITH_BUILDINFO int label_delta = 0; int hash_width, date_width; @@ -1802,6 +1791,17 @@ static uiBlock *wm_block_create_splash(bContext *C, ARegion *ar, void *UNUSED(ar date_width = (int)BLF_width(style->widgetlabel.uifont_id, date_buf, sizeof(date_buf)) + U.widget_unit; #endif /* WITH_BUILDINFO */ +#ifndef WITH_HEADLESS + 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>"); + } +#endif + block = uiBeginBlock(C, ar, "_popup", UI_EMBOSS); /* note on UI_BLOCK_NO_WIN_CLIP, the window size is not always synchronized |