Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Fri, 15 Jun 2018 15:43:18 +0000 (17:43 +0200)
committerBastien Montagne <montagne29@wanadoo.fr>
Fri, 15 Jun 2018 15:43:18 +0000 (17:43 +0200)
source/blender/blenlib/BLI_callbacks.h
source/blender/blenlib/intern/callbacks.c
source/blender/render/intern/source/pipeline.c
source/creator/creator_args.c
source/creator/creator_signals.c

index adc7bf5af6b325841327013919ccfec0588d023c..c913510bda3981c55f79578cd8cd312c23ec7c1a 100644 (file)
@@ -62,7 +62,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);
index 191be49263c4b0c6fd9356753252ae7be2a2a27b..766e3f38f00ddfc9677985c896b70d340edb965e 100644 (file)
 
 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);
        }
 }
 
index 141607828982e5e76bc50345aa5f0b236180cf7c..8ecfe801d709345633553d232843486634902762 100644 (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. */
        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);
index 657ea3f1eb3309ce0d613934d9960d3515d3313d..da5dcf9ff8b1f9a5beedccb7a70714e246a2cc90 100644 (file)
@@ -397,7 +397,7 @@ static void arg_py_context_restore(
        /* script may load a file, check old data is valid before using */
        if (c_py->has_win) {
                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)))
                {
                        CTX_wm_window_set(C, c_py->win);
@@ -405,7 +405,7 @@ static void arg_py_context_restore(
        }
 
        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);
        }
@@ -1774,7 +1774,7 @@ static int arg_handle_load_file(int UNUSED(argc), const char **argv, void *data)
 
                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. */
-                       BLI_strncpy(G.main->name, filename, FILE_MAX);
+                       BLI_strncpy(G_MAIN->name, filename, FILE_MAX);
                        G.relbase_valid = true;
                        G.save_over = true;
                        printf("... opened default scene instead; saving will write to: %s\n", filename);
index 55f9777f55ae05815a867d9f4bbee49e8c714ad5..44c93d2c615996c8ad51aa8d3e46a48fe922bf09 100644 (file)
@@ -110,7 +110,7 @@ static void sig_handle_crash_backtrace(FILE *fp)
 
 static void sig_handle_crash(int signum)
 {
-       wmWindowManager *wm = G.main->wm.first;
+       wmWindowManager *wm = G_MAIN->wm.first;
 
 #ifdef USE_WRITE_CRASH_BLEND
        if (wm->undo_stack) {
@@ -118,11 +118,11 @@ static void sig_handle_crash(int signum)
                if (memfile) {
                        char fname[FILE_MAX];
 
-                       if (!G.main->name[0]) {
+                       if (!G_MAIN->name[0]) {
                                BLI_make_file_string("/", fname, BKE_tempdir_base(), "crash.blend");
                        }
                        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");
                        }
 
@@ -139,11 +139,11 @@ static void sig_handle_crash(int signum)
 
        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");
        }
        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");
        }