diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-15 18:43:18 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-15 18:43:18 +0300 |
| commit | ecc57e7524bf04d498646715dcf4f9340ef3fc56 (patch) | |
| tree | 220f951e1ff1be7bc769a1401845928f3f581330 /source/creator/creator_signals.c | |
| parent | 9c629b06bfdf645c009d953902c936b82900053a (diff) | |
| parent | d645b1a78a752950d061a4ccb125721acade5544 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/creator/creator_signals.c')
| -rw-r--r-- | source/creator/creator_signals.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source/creator/creator_signals.c b/source/creator/creator_signals.c index 55f9777f55a..44c93d2c615 100644 --- a/source/creator/creator_signals.c +++ b/source/creator/creator_signals.c @@ -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"); } |