diff options
author | Brecht Van Lommel <brecht@blender.org> | 2021-06-22 20:11:06 +0300 |
---|---|---|
committer | Brecht Van Lommel <brecht@blender.org> | 2021-06-22 20:13:50 +0300 |
commit | 3a48147b8ab92e4828157ec7a3a1a75dd1a6b964 (patch) | |
tree | b1b3875b83eda3b5213fd2318ba8751819c0b337 /source/blender/blenkernel/intern/blendfile.c | |
parent | 0b15353baa5c7c5b57ccb5dff8ef0fdf0d8beb5d (diff) |
Revert "Enhanced stats/reports for blendfile reading."
This change crashes library linking operators, related tests and probably more.
This reverts commit f8d219dfd4c31a918e33cb715472d91a5cd3fd51.
Ref D11583
Diffstat (limited to 'source/blender/blenkernel/intern/blendfile.c')
-rw-r--r-- | source/blender/blenkernel/intern/blendfile.c | 33 |
1 files changed, 11 insertions, 22 deletions
diff --git a/source/blender/blenkernel/intern/blendfile.c b/source/blender/blenkernel/intern/blendfile.c index 3a59bc64652..54fd3f55c31 100644 --- a/source/blender/blenkernel/intern/blendfile.c +++ b/source/blender/blenkernel/intern/blendfile.c @@ -36,8 +36,6 @@ #include "BLI_system.h" #include "BLI_utildefines.h" -#include "PIL_time.h" - #include "IMB_colormanagement.h" #include "BKE_addon.h" @@ -138,7 +136,7 @@ static void setup_app_userdef(BlendFileData *bfd) static void setup_app_data(bContext *C, BlendFileData *bfd, const struct BlendFileReadParams *params, - BlendFileReadReport *reports) + ReportList *reports) { Main *bmain = G_MAIN; Scene *curscene = NULL; @@ -157,7 +155,7 @@ static void setup_app_data(bContext *C, /* may happen with library files - UNDO file should never have NULL curscene (but may have a * NULL curscreen)... */ else if (ELEM(NULL, bfd->curscreen, bfd->curscene)) { - BKE_report(reports->reports, RPT_WARNING, "Library file, loading empty scene"); + BKE_report(reports, RPT_WARNING, "Library file, loading empty scene"); mode = LOAD_UI_OFF; } else if (G.fileflags & G_FILE_NO_UI) { @@ -398,17 +396,11 @@ static void setup_app_data(bContext *C, } if (mode != LOAD_UNDO && !USER_EXPERIMENTAL_TEST(&U, no_override_auto_resync)) { - reports->duration.lib_overrides_resync = PIL_check_seconds_timer(); - BKE_lib_override_library_main_resync( bmain, curscene, bfd->cur_view_layer ? bfd->cur_view_layer : BKE_view_layer_default_view(curscene), reports); - - reports->duration.lib_overrides_resync = PIL_check_seconds_timer() - - reports->duration.lib_overrides_resync; - /* We need to rebuild some of the deleted override rules (for UI feedback purpose). */ BKE_lib_override_library_main_operations_create(bmain, true); } @@ -417,7 +409,7 @@ static void setup_app_data(bContext *C, static void setup_app_blend_file_data(bContext *C, BlendFileData *bfd, const struct BlendFileReadParams *params, - BlendFileReadReport *reports) + ReportList *reports) { if ((params->skip_flags & BLO_READ_SKIP_USERDEF) == 0) { setup_app_userdef(bfd); @@ -427,12 +419,12 @@ static void setup_app_blend_file_data(bContext *C, } } -static void handle_subversion_warning(Main *main, BlendFileReadReport *reports) +static void handle_subversion_warning(Main *main, ReportList *reports) { if (main->minversionfile > BLENDER_FILE_VERSION || (main->minversionfile == BLENDER_FILE_VERSION && main->minsubversionfile > BLENDER_FILE_SUBVERSION)) { - BKE_reportf(reports->reports, + BKE_reportf(reports, RPT_ERROR, "File written by newer Blender binary (%d.%d), expect loss of data!", main->minversionfile, @@ -451,7 +443,7 @@ static void handle_subversion_warning(Main *main, BlendFileReadReport *reports) void BKE_blendfile_read_setup_ex(bContext *C, BlendFileData *bfd, const struct BlendFileReadParams *params, - BlendFileReadReport *reports, + ReportList *reports, /* Extra args. */ const bool startup_update_defaults, const char *startup_app_template) @@ -468,7 +460,7 @@ void BKE_blendfile_read_setup_ex(bContext *C, void BKE_blendfile_read_setup(bContext *C, BlendFileData *bfd, const struct BlendFileReadParams *params, - BlendFileReadReport *reports) + ReportList *reports) { BKE_blendfile_read_setup_ex(C, bfd, params, reports, false, NULL); } @@ -478,7 +470,7 @@ void BKE_blendfile_read_setup(bContext *C, */ struct BlendFileData *BKE_blendfile_read(const char *filepath, const struct BlendFileReadParams *params, - BlendFileReadReport *reports) + ReportList *reports) { /* Don't print startup file loading. */ if (params->is_startup == false) { @@ -490,7 +482,7 @@ struct BlendFileData *BKE_blendfile_read(const char *filepath, handle_subversion_warning(bfd->main, reports); } else { - BKE_reports_prependf(reports->reports, "Loading '%s' failed: ", filepath); + BKE_reports_prependf(reports, "Loading '%s' failed: ", filepath); } return bfd; } @@ -567,9 +559,7 @@ UserDef *BKE_blendfile_userdef_read(const char *filepath, ReportList *reports) BlendFileData *bfd; UserDef *userdef = NULL; - bfd = BLO_read_from_file(filepath, - BLO_READ_SKIP_ALL & ~BLO_READ_SKIP_USERDEF, - &(struct BlendFileReadReport){.reports = reports}); + bfd = BLO_read_from_file(filepath, BLO_READ_SKIP_ALL & ~BLO_READ_SKIP_USERDEF, reports); if (bfd) { if (bfd->user) { userdef = bfd->user; @@ -780,8 +770,7 @@ WorkspaceConfigFileData *BKE_blendfile_workspace_config_read(const char *filepat WorkspaceConfigFileData *workspace_config = NULL; if (filepath) { - bfd = BLO_read_from_file( - filepath, BLO_READ_SKIP_USERDEF, &(struct BlendFileReadReport){.reports = reports}); + bfd = BLO_read_from_file(filepath, BLO_READ_SKIP_USERDEF, reports); } else { bfd = BLO_read_from_memory(filebuf, filelength, BLO_READ_SKIP_USERDEF, reports); |