forked from bartvdbraak/blender
Cleanup: some more G.main removal.
We are really starting to scratch the last bits here...
This commit is contained in:
parent
49915e3241
commit
d645b1a78a
@ -66,7 +66,7 @@ typedef struct bCallbackFuncStore {
|
|||||||
} 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_add(bCallbackFuncStore *funcstore, eCbEvent evt);
|
||||||
|
|
||||||
void BLI_callback_global_init(void);
|
void BLI_callback_global_init(void);
|
||||||
|
@ -32,13 +32,13 @@
|
|||||||
|
|
||||||
static ListBase callback_slots[BLI_CB_EVT_TOT] = {{NULL}};
|
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];
|
ListBase *lb = &callback_slots[evt];
|
||||||
bCallbackFuncStore *funcstore;
|
bCallbackFuncStore *funcstore;
|
||||||
|
|
||||||
for (funcstore = lb->first; funcstore; funcstore = funcstore->next) {
|
for (funcstore = lb->first; funcstore; funcstore = funcstore->next) {
|
||||||
funcstore->func(main, self, funcstore->arg);
|
funcstore->func(bmain, self, funcstore->arg);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -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. */
|
/* Flush stdout to be sure python callbacks are printing stuff after blender. */
|
||||||
fflush(stdout);
|
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);
|
BLI_timecode_string_from_time_simple(name, sizeof(name), re->i.lastframetime - render_time);
|
||||||
printf(" (Saving: %s)\n", name);
|
printf(" (Saving: %s)\n", name);
|
||||||
|
Loading…
Reference in New Issue
Block a user