diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2021-04-21 06:48:10 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2021-04-21 06:48:10 +0300 |
| commit | 3003fbbecfc1084a89282883a676702e087452f5 (patch) | |
| tree | edb53e04c6ee981b0295c36fbb7e2a87944a97d6 | |
| parent | c5cabb6eb712ffc1f541b8b1adc8b17ea76b069f (diff) | |
| parent | 5da3177190254273790043318db7e6a177270d55 (diff) | |
Merge branch 'blender-v2.93-release'
| -rw-r--r-- | source/creator/creator_args.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/source/creator/creator_args.c b/source/creator/creator_args.c index d1899cc1408..d7f649b657d 100644 --- a/source/creator/creator_args.c +++ b/source/creator/creator_args.c @@ -2041,6 +2041,15 @@ void main_args_setup(bContext *C, bArgs *ba) BLI_args_add(ba, "-t", "--threads", CB(arg_handle_threads_set), NULL); + /* Include in the environment pass so it's possible display errors initializing subsystems, + * especially `bpy.appdir` since it's useful to show errors finding paths on startup. */ + BLI_args_add(ba, NULL, "--log", CB(arg_handle_log_set), ba); + BLI_args_add(ba, NULL, "--log-level", CB(arg_handle_log_level_set), ba); + BLI_args_add(ba, NULL, "--log-show-basename", CB(arg_handle_log_show_basename_set), ba); + BLI_args_add(ba, NULL, "--log-show-backtrace", CB(arg_handle_log_show_backtrace_set), ba); + BLI_args_add(ba, NULL, "--log-show-timestamp", CB(arg_handle_log_show_timestamp_set), ba); + BLI_args_add(ba, NULL, "--log-file", CB(arg_handle_log_file_set), ba); + /* Pass: Background Mode & Settings * * Also and commands that exit after usage. */ @@ -2062,13 +2071,6 @@ void main_args_setup(bContext *C, bArgs *ba) BLI_args_add(ba, "-a", NULL, CB(arg_handle_playback_mode), NULL); - BLI_args_add(ba, NULL, "--log", CB(arg_handle_log_set), ba); - BLI_args_add(ba, NULL, "--log-level", CB(arg_handle_log_level_set), ba); - BLI_args_add(ba, NULL, "--log-show-basename", CB(arg_handle_log_show_basename_set), ba); - BLI_args_add(ba, NULL, "--log-show-backtrace", CB(arg_handle_log_show_backtrace_set), ba); - BLI_args_add(ba, NULL, "--log-show-timestamp", CB(arg_handle_log_show_timestamp_set), ba); - BLI_args_add(ba, NULL, "--log-file", CB(arg_handle_log_file_set), ba); - BLI_args_add(ba, "-d", "--debug", CB(arg_handle_debug_mode_set), ba); # ifdef WITH_FFMPEG |