griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

skip loading file selector icons when running in background mode.

Browse Source
This commit is contained in:
Campbell Barton
2012-08-08 08:25:20 +00:00
parent 9ccb8b8c40
commit 206b7a6d1b
2 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
source/blender/editors/space_file/filelist.c
View File

@@ -383,6 +383,9 @@ void filelist_init_icons(void)
short x, y, k;
ImBuf *bbuf;
ImBuf *ibuf;
BLI_assert(G.background == FALSE);
#ifdef WITH_HEADLESS
bbuf = NULL;
#else
@@ -408,6 +411,9 @@ void filelist_init_icons(void)
void filelist_free_icons(void)
{
int i;
BLI_assert(G.background == FALSE);
for (i = 0; i < SPECIAL_IMG_MAX; ++i) {
IMB_freeImBuf(gSpecialFileImages[i]);
gSpecialFileImages[i] = NULL;
@@ -615,7 +621,10 @@ short filelist_changed(struct FileList *filelist)
ImBuf *filelist_getimage(struct FileList *filelist, int index)
{
ImBuf *ibuf = NULL;
int fidx = 0;
int fidx = 0;
BLI_assert(G.background == FALSE);
if ( (index < 0) || (index >= filelist->numfiltered) ) {
return NULL;
}
@@ -629,7 +638,10 @@ ImBuf *filelist_geticon(struct FileList *filelist, int index)
{
ImBuf *ibuf = NULL;
struct direntry *file = NULL;
int fidx = 0;
int fidx = 0;
BLI_assert(G.background == FALSE);
if ( (index < 0) || (index >= filelist->numfiltered) ) {
return NULL;
}

11
source/blender/editors/space_file/space_file.c
View File

@@ -48,6 +48,7 @@
#include "BKE_context.h"
#include "BKE_screen.h"
#include "BKE_global.h"
#include "ED_space_api.h"
#include "ED_screen.h"
@@ -624,12 +625,18 @@ void ED_file_init(void)
fsmenu_read_bookmarks(fsmenu_get(), name);
}
filelist_init_icons();
if (G.background == FALSE) {
filelist_init_icons();
}
IMB_thumb_makedirs();
}
void ED_file_exit(void)
{
fsmenu_free(fsmenu_get());
filelist_free_icons();
if (G.background == FALSE) {
filelist_free_icons();
}
}