[Bf-blender-cvs] [58fc1559767] master: Cleanup: move WM_init & arg parsing out of if/else branch

[Campbell Barton]

Commit: 58fc1559767fcee4f708504518834c625c86bac7
Author: Campbell Barton
Date:   Wed Oct 28 13:22:49 2020 +1100
Branches: master
https://developer.blender.org/rB58fc1559767fcee4f708504518834c625c86bac7

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

===================================================================

M	source/creator/creator.c

===================================================================

diff --git a/source/creator/creator.c b/source/creator/creator.c
index eba6c7c292f..90d918f71ac 100644
--- a/source/creator/creator.c
+++ b/source/creator/creator.c
@@ -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();
 
-  if (G.background == 0) {
 #ifndef WITH_PYTHON_MODULE
+  if (G.background == 0) {
     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"