blender
/
blender
136
404
Fork 586
Code Issues 6.2k Pull Requests 752 Projects 19 Wiki Activity

Cleanup: parse '--thread' as part of ARG_PASS_ENVIRONMENT 

While this isn't needed at the moment, it's possible
the animation player uses the scheduler in the future.
This commit is contained in:
Campbell Barton 2020-10-30 13:11:35 +11:00
parent 6ab8cbc68c
commit b018582cd3
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/creator/creator.c
View File

@ -415,6 +415,9 @@ int main(int argc,
* since they impact `BKE_appdir` behavior. */
BKE_appdir_init();
/* After parsing number of threads argument. */
BLI_task_scheduler_init();
/* Initialize sub-systems that use `BKE_appdir.h`. */
IMB_init();
@ -425,9 +428,6 @@ int main(int argc,
main_signal_setup();
#endif
/* After parsing number of threads argument. */
BLI_task_scheduler_init();
#ifdef WITH_FFMPEG
/* Keep after #ARG_PASS_SETTINGS since debug flags are checked. */
IMB_ffmpeg_init();

4
source/creator/creator_args.c
View File

@ -2071,6 +2071,8 @@ void main_args_setup(bContext *C, bArgs *ba)
BLI_argsAdd(ba, NULL, "--env-system-scripts", CB_EX(arg_handle_env_system_set, scripts), NULL);
BLI_argsAdd(ba, NULL, "--env-system-python", CB_EX(arg_handle_env_system_set, python), NULL);
BLI_argsAdd(ba, "-t", "--threads", CB(arg_handle_threads_set), NULL);
/* Pass: Background Mode & Settings
*
* Also and commands that exit after usage. */
@ -2088,8 +2090,6 @@ void main_args_setup(bContext *C, bArgs *ba)
BLI_argsAdd(ba, NULL, "--disable-crash-handler", CB(arg_handle_crash_handler_disable), NULL);
BLI_argsAdd(ba, NULL, "--disable-abort-handler", CB(arg_handle_abort_handler_disable), NULL);
BLI_argsAdd(ba, "-t", "--threads", CB(arg_handle_threads_set), NULL);
BLI_argsAdd(ba, "-b", "--background", CB(arg_handle_background_mode_set), NULL);
BLI_argsAdd(ba, "-a", NULL, CB(arg_handle_playback_mode), NULL);