Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Sat, 18 Aug 2018 09:18:55 +0000 (19:18 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Sat, 18 Aug 2018 09:18:55 +0000 (19:18 +1000)
1  2 
CMakeLists.txt
source/blender/windowmanager/WM_api.h
source/blender/windowmanager/intern/wm_files.c
source/blender/windowmanager/intern/wm_init_exit.c
source/creator/creator_args.c

diff --cc CMakeLists.txt
Simple merge
index 45f6e18848304532b2360d1267101118de222f4f,dd2f9b4c450486372fc4fe648dd17869ba405439..39364ee27be9ba6469c372eca6cc7f8579cdc365
@@@ -77,11 -70,11 +77,14 @@@ struct wmNDOFMotionData
  #endif
  
  typedef struct wmJob wmJob;
 +typedef struct wmGizmo wmGizmo;
 +typedef struct wmGizmoMap wmGizmoMap;
 +typedef struct wmGizmoMapType wmGizmoMapType;
  
  /* general API */
+ void          WM_init_state_app_template_set(const char *app_template);
+ const char *WM_init_state_app_template_get(void);
  void          WM_init_state_size_set          (int stax, int stay, int sizx, int sizy);
  void          WM_init_state_fullscreen_set(void);
  void          WM_init_state_normal_set(void);
index 4b0d751a7ce64090847f8e33880d3ded089ea09a,185cf3fad4fc176fc42cde1e191026cccf632cc8..719544403dd05715be18ab21adac89741ebdc196
@@@ -247,10 -194,8 +247,10 @@@ void WM_init(bContext *C, int argc, con
         * but keep before file reading, since that may report errors */
        wm_init_reports(C);
  
 +      WM_msgbus_types_init();
 +
        /* get the default database, plus a wm */
-       wm_homefile_read(C, NULL, G.factory_startup, false, true, NULL, NULL);
+       wm_homefile_read(C, NULL, G.factory_startup, false, true, NULL, WM_init_state_app_template_get());
  
        BLT_lang_set(NULL);
  
index 283585598bf885e835fa1d0c2c7bcc2b2f62c790,7ad44916047c1e1d8d70e1c938009068b39cdca5..5e9cec660e120a15854734e77b72f2beaf44fb0d
@@@ -1896,8 -2055,12 +1913,9 @@@ void main_args_setup(bContext *C, bArg
        BLI_argsAdd(ba, 1, NULL, "--debug-gpu-shaders",
                    CB_EX(arg_handle_debug_mode_generic_set, gpumem), (void *)G_DEBUG_GPU_SHADERS);
  
 -      BLI_argsAdd(ba, 1, NULL, "--enable-new-depsgraph", CB(arg_handle_depsgraph_use_new), NULL);
 -      BLI_argsAdd(ba, 1, NULL, "--enable-new-basic-shader-glsl", CB(arg_handle_basic_shader_glsl_use_new), NULL);
 -
        BLI_argsAdd(ba, 1, NULL, "--verbose", CB(arg_handle_verbosity_set), NULL);
  
+       BLI_argsAdd(ba, 1, NULL, "--app-template", CB(arg_handle_app_template), NULL);
        BLI_argsAdd(ba, 1, NULL, "--factory-startup", CB(arg_handle_factory_startup_set), NULL);
  
        /* TODO, add user env vars? */