Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Fri, 30 Nov 2018 02:24:17 +0000 (13:24 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 30 Nov 2018 02:24:17 +0000 (13:24 +1100)
source/blender/windowmanager/intern/wm_files.c
source/blender/windowmanager/wm_files.h

index 1e714f1dfb45d4b4d183e8bf603299319255da82..8c263461af6ce9ec3e6c2be787404bec13f1caae 100644 (file)
@@ -733,7 +733,7 @@ static bool wm_app_template_has_userpref(const char *app_template)
  * \param app_template_override: Template to use instead of the template defined in user-preferences.
  * When not-null, this is written into the user preferences.
  */
-int wm_homefile_read(
+void wm_homefile_read(
         bContext *C, ReportList *reports,
         bool use_factory_settings, bool use_empty_data, bool use_userdef,
         const char *filepath_startup_override, const char *app_template_override)
@@ -988,8 +988,6 @@ int wm_homefile_read(
        G.save_over = 0;
 
        wm_file_read_post(C, true, reset_app_template);
-
-       return true;
 }
 
 /** \name WM History File API
@@ -1743,15 +1741,11 @@ static int wm_homefile_read_exec(bContext *C, wmOperator *op)
                app_template = WM_init_state_app_template_get();
        }
 
-       if (wm_homefile_read(C, op->reports, use_factory_settings, use_empty_data, use_userdef, filepath, app_template)) {
-               if (use_splash) {
-                       WM_init_splash(C);
-               }
-               return OPERATOR_FINISHED;
-       }
-       else {
-               return OPERATOR_CANCELLED;
+       wm_homefile_read(C, op->reports, use_factory_settings, use_empty_data, use_userdef, filepath, app_template);
+       if (use_splash) {
+               WM_init_splash(C);
        }
+       return OPERATOR_FINISHED;
 }
 
 static int wm_homefile_read_invoke(bContext *C, wmOperator *UNUSED(op), const wmEvent *UNUSED(event))
index 147ed88296664a7cbed8907893724d36493cd88a..465abf011faf7bf36097cad0e23a3451ae7024ff 100644 (file)
@@ -35,8 +35,8 @@ struct Main;
 struct wmOperatorType;
 
 /* wm_files.c */
-void           wm_history_file_read(void);
-int                    wm_homefile_read(
+void wm_history_file_read(void);
+void wm_homefile_read(
         struct bContext *C, struct ReportList *reports,
         bool use_factory_settings, bool use_empty_data, bool use_userdef,
         const char *filepath_startup_override, const char *app_template_override);