Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2021-08-12 07:50:40 +0300
committerCampbell Barton <ideasman42@gmail.com>2021-08-12 07:59:08 +0300
commit497bc4d19977abc7b9e2c0f5024a23057e680954 (patch)
tree64de5bd98db4f90b59fed0009a87c0009b68fc72 /source/blender/windowmanager/wm_files.h
parent216414c65a6b3690aba75caf74d1dbf6dd8247a1 (diff)
Fix T89046: Startup file with Python drivers crashes on load
Resolve order of initialization error reading startup file, support postponing running wm_file_read_post until Blender has been initialized. Deferring updates allows duplicate initialization to be removed from WM_init. Reviewed By: mont29 Ref D12184
Diffstat (limited to 'source/blender/windowmanager/wm_files.h')
-rw-r--r--source/blender/windowmanager/wm_files.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/source/blender/windowmanager/wm_files.h b/source/blender/windowmanager/wm_files.h
index 7009885495b..2fa5a68829e 100644
--- a/source/blender/windowmanager/wm_files.h
+++ b/source/blender/windowmanager/wm_files.h
@@ -24,6 +24,7 @@
#pragma once
struct Main;
+struct wmFileReadPost_Params;
struct wmGenericCallback;
struct wmOperatorType;
@@ -64,11 +65,14 @@ struct wmHomeFileRead_Params {
void wm_homefile_read_ex(struct bContext *C,
const struct wmHomeFileRead_Params *params_homefile,
struct ReportList *reports,
- bool *r_is_factory_startup);
+ struct wmFileReadPost_Params **r_params_file_read_post);
void wm_homefile_read(struct bContext *C,
const struct wmHomeFileRead_Params *params_homefile,
struct ReportList *reports);
+void wm_homefile_read_post(struct bContext *C,
+ const struct wmFileReadPost_Params *params_file_read_post);
+
void wm_file_read_report(bContext *C, struct Main *bmain);
void wm_close_file_dialog(bContext *C, struct wmGenericCallback *post_action);