blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 746 Projects 19 Wiki Activity

Cleanup: some more G.main removal. 

We are really starting to scratch the last bits here...
This commit is contained in:
Bastien Montagne 2018-06-15 17:42:17 +02:00
parent 49915e3241
commit d645b1a78a
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/blenlib/BLI_callbacks.h
View File

@ -66,7 +66,7 @@ typedef struct bCallbackFuncStore {
} bCallbackFuncStore;
void BLI_callback_exec(struct Main *main, struct ID *self, eCbEvent evt);
void BLI_callback_exec(struct Main *bmain, struct ID *self, eCbEvent evt);
void BLI_callback_add(bCallbackFuncStore *funcstore, eCbEvent evt);
void BLI_callback_global_init(void);

4
source/blender/blenlib/intern/callbacks.c
View File

@ -32,13 +32,13 @@
static ListBase callback_slots[BLI_CB_EVT_TOT] = {{NULL}};
void BLI_callback_exec(struct Main *main, struct ID *self, eCbEvent evt)
void BLI_callback_exec(struct Main *bmain, struct ID *self, eCbEvent evt)
{
ListBase *lb = &callback_slots[evt];
bCallbackFuncStore *funcstore;
for (funcstore = lb->first; funcstore; funcstore = funcstore->next) {
funcstore->func(main, self, funcstore->arg);
funcstore->func(bmain, self, funcstore->arg);
}
}

2
source/blender/render/intern/source/pipeline.c
View File

@ -3577,7 +3577,7 @@ static int do_write_image_or_movie(Render *re, Main *bmain, Scene *scene, bMovie
/* Flush stdout to be sure python callbacks are printing stuff after blender. */
fflush(stdout);
BLI_callback_exec(G.main, NULL, BLI_CB_EVT_RENDER_STATS);
BLI_callback_exec(re->main, NULL, BLI_CB_EVT_RENDER_STATS);
BLI_timecode_string_from_time_simple(name, sizeof(name), re->i.lastframetime - render_time);
printf(" (Saving: %s)\n", name);