blender
/
blender
136
406
Fork 589
Code Issues 6.2k Pull Requests 748 Projects 19 Wiki Activity

Cleanup: move WM_init & arg parsing out of if/else branch

This commit is contained in:
Campbell Barton 2020-10-28 13:22:49 +11:00
parent 6445caa9b5
commit 58fc155976
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
source/creator/creator.c
View File

@ -428,6 +428,7 @@ int main(int argc,
BLI_task_scheduler_init();
#ifdef WITH_FFMPEG
/* Keep after #ARG_PASS_SETTINGS since debug flags are checked. */
IMB_ffmpeg_init();
#endif
@ -457,20 +458,15 @@ int main(int argc,
BKE_materials_init();
#ifndef WITH_PYTHON_MODULE
if (G.background == 0) {
#ifndef WITH_PYTHON_MODULE
BLI_argsParse(ba, ARG_PASS_SETTINGS_GUI, NULL, NULL);
BLI_argsParse(ba, ARG_PASS_SETTINGS_FORCE, NULL, NULL);
#endif
WM_init(C, argc, (const char **)argv);
}
else {
#ifndef WITH_PYTHON_MODULE
BLI_argsParse(ba, ARG_PASS_SETTINGS_FORCE, NULL, NULL);
BLI_argsParse(ba, ARG_PASS_SETTINGS_FORCE, NULL, NULL);
#endif
WM_init(C, argc, (const char **)argv);
}
WM_init(C, argc, (const char **)argv);
#ifndef WITH_PYTHON
printf(
"\n* WARNING * - Blender compiled without Python!\n"