sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Merge branch 'master' into blender2.8

Browse Source
This commit is contained in:
Bastien Montagne 2018-06-15 17:43:18 +02:00
commit ecc57e7524
5 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -62,7 +62,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);

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

@ -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);
} }
} }

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

@ -2325,7 +2325,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);

6
source/creator/creator_args.c
View File

@ -397,7 +397,7 @@ static void arg_py_context_restore(
/* script may load a file, check old data is valid before using */ /* script may load a file, check old data is valid before using */
if (c_py->has_win) { if (c_py->has_win) {
if ((c_py->win == NULL) || if ((c_py->win == NULL) ||
((BLI_findindex(&G.main->wm, c_py->wm) != -1) && ((BLI_findindex(&G_MAIN->wm, c_py->wm) != -1) &&
(BLI_findindex(&c_py->wm->windows, c_py->win) != -1))) (BLI_findindex(&c_py->wm->windows, c_py->win) != -1)))
{ {
CTX_wm_window_set(C, c_py->win); CTX_wm_window_set(C, c_py->win);
@ -405,7 +405,7 @@ static void arg_py_context_restore(
} }
if ((c_py->scene == NULL) || if ((c_py->scene == NULL) ||
BLI_findindex(&G.main->scene, c_py->scene) != -1) BLI_findindex(&G_MAIN->scene, c_py->scene) != -1)
{ {
CTX_data_scene_set(C, c_py->scene); CTX_data_scene_set(C, c_py->scene);
} }
@ -1774,7 +1774,7 @@ static int arg_handle_load_file(int UNUSED(argc), const char **argv, void *data)
if (BLO_has_bfile_extension(filename)) { if (BLO_has_bfile_extension(filename)) {
/* Just pretend a file was loaded, so the user can press Save and it'll save at the filename from the CLI. */ /* Just pretend a file was loaded, so the user can press Save and it'll save at the filename from the CLI. */
BLI_strncpy(G.main->name, filename, FILE_MAX); BLI_strncpy(G_MAIN->name, filename, FILE_MAX);
G.relbase_valid = true; G.relbase_valid = true;
G.save_over = true; G.save_over = true;
printf("... opened default scene instead; saving will write to: %s\n", filename); printf("... opened default scene instead; saving will write to: %s\n", filename);

10
source/creator/creator_signals.c
View File

@ -110,7 +110,7 @@ static void sig_handle_crash_backtrace(FILE *fp)
static void sig_handle_crash(int signum) static void sig_handle_crash(int signum)
{ {
wmWindowManager *wm = G.main->wm.first; wmWindowManager *wm = G_MAIN->wm.first;
#ifdef USE_WRITE_CRASH_BLEND #ifdef USE_WRITE_CRASH_BLEND
if (wm->undo_stack) { if (wm->undo_stack) {
@ -118,11 +118,11 @@ static void sig_handle_crash(int signum)
if (memfile) { if (memfile) {
char fname[FILE_MAX]; char fname[FILE_MAX];
if (!G.main->name[0]) { if (!G_MAIN->name[0]) {
BLI_make_file_string("/", fname, BKE_tempdir_base(), "crash.blend"); BLI_make_file_string("/", fname, BKE_tempdir_base(), "crash.blend");
} }
else { else {
BLI_strncpy(fname, G.main->name, sizeof(fname)); BLI_strncpy(fname, G_MAIN->name, sizeof(fname));
BLI_replace_extension(fname, sizeof(fname), ".crash.blend"); BLI_replace_extension(fname, sizeof(fname), ".crash.blend");
} }
@ -139,11 +139,11 @@ static void sig_handle_crash(int signum)
char fname[FILE_MAX]; char fname[FILE_MAX];
if (!G.main->name[0]) { if (!G_MAIN->name[0]) {
BLI_join_dirfile(fname, sizeof(fname), BKE_tempdir_base(), "blender.crash.txt"); BLI_join_dirfile(fname, sizeof(fname), BKE_tempdir_base(), "blender.crash.txt");
} }
else { else {
BLI_join_dirfile(fname, sizeof(fname), BKE_tempdir_base(), BLI_path_basename(G.main->name)); BLI_join_dirfile(fname, sizeof(fname), BKE_tempdir_base(), BLI_path_basename(G_MAIN->name));
BLI_replace_extension(fname, sizeof(fname), ".crash.txt"); BLI_replace_extension(fname, sizeof(fname), ".crash.txt");
} }