[Bf-blender-cvs] [3a48147b8ab] master: Revert "Enhanced stats/reports for blendfile reading."
Brecht Van Lommel
noreply at git.blender.org
Tue Jun 22 19:14:02 CEST 2021
Commit: 3a48147b8ab92e4828157ec7a3a1a75dd1a6b964
Author: Brecht Van Lommel
Date: Tue Jun 22 19:11:06 2021 +0200
Branches: master
https://developer.blender.org/rB3a48147b8ab92e4828157ec7a3a1a75dd1a6b964
Revert "Enhanced stats/reports for blendfile reading."
This change crashes library linking operators, related tests and probably more.
This reverts commit f8d219dfd4c31a918e33cb715472d91a5cd3fd51.
Ref D11583
===================================================================
M source/blender/blenkernel/BKE_blendfile.h
M source/blender/blenkernel/BKE_lib_override.h
M source/blender/blenkernel/intern/blender_undo.c
M source/blender/blenkernel/intern/blendfile.c
M source/blender/blenkernel/intern/lib_override.c
M source/blender/blenloader/BLO_read_write.h
M source/blender/blenloader/BLO_readfile.h
M source/blender/blenloader/intern/readblenentry.c
M source/blender/blenloader/intern/readfile.c
M source/blender/blenloader/intern/readfile.h
M source/blender/blenloader/intern/versioning_280.c
M source/blender/blenloader/tests/blendfile_loading_base_test.cc
M source/blender/editors/space_outliner/outliner_tools.c
M source/blender/windowmanager/intern/wm_files.c
===================================================================
diff --git a/source/blender/blenkernel/BKE_blendfile.h b/source/blender/blenkernel/BKE_blendfile.h
index 3e0a343a766..429e294a337 100644
--- a/source/blender/blenkernel/BKE_blendfile.h
+++ b/source/blender/blenkernel/BKE_blendfile.h
@@ -25,7 +25,6 @@ extern "C" {
struct BlendFileData;
struct BlendFileReadParams;
-struct BlendFileReadReport;
struct ID;
struct Main;
struct MemFile;
@@ -36,7 +35,7 @@ struct bContext;
void BKE_blendfile_read_setup_ex(struct bContext *C,
struct BlendFileData *bfd,
const struct BlendFileReadParams *params,
- struct BlendFileReadReport *reports,
+ struct ReportList *reports,
/* Extra args. */
const bool startup_update_defaults,
const char *startup_app_template);
@@ -44,11 +43,11 @@ void BKE_blendfile_read_setup_ex(struct bContext *C,
void BKE_blendfile_read_setup(struct bContext *C,
struct BlendFileData *bfd,
const struct BlendFileReadParams *params,
- struct BlendFileReadReport *reports);
+ struct ReportList *reports);
struct BlendFileData *BKE_blendfile_read(const char *filepath,
const struct BlendFileReadParams *params,
- struct BlendFileReadReport *reports);
+ struct ReportList *reports);
struct BlendFileData *BKE_blendfile_read_from_memory(const void *filebuf,
int filelength,
diff --git a/source/blender/blenkernel/BKE_lib_override.h b/source/blender/blenkernel/BKE_lib_override.h
index 3eb0ff44129..4dc99e64cf2 100644
--- a/source/blender/blenkernel/BKE_lib_override.h
+++ b/source/blender/blenkernel/BKE_lib_override.h
@@ -43,7 +43,6 @@ extern "C" {
#endif
struct Collection;
-struct BlendFileReadReport;
struct ID;
struct IDOverrideLibrary;
struct IDOverrideLibraryProperty;
@@ -91,11 +90,11 @@ bool BKE_lib_override_library_resync(struct Main *bmain,
struct Collection *override_resync_residual_storage,
const bool do_hierarchy_enforce,
const bool do_post_process,
- struct BlendFileReadReport *reports);
+ struct ReportList *reports);
void BKE_lib_override_library_main_resync(struct Main *bmain,
struct Scene *scene,
struct ViewLayer *view_layer,
- struct BlendFileReadReport *reports);
+ struct ReportList *reports);
void BKE_lib_override_library_delete(struct Main *bmain, struct ID *id_root);
diff --git a/source/blender/blenkernel/intern/blender_undo.c b/source/blender/blenkernel/intern/blender_undo.c
index 6f47cd1336e..ba41786c7fd 100644
--- a/source/blender/blenkernel/intern/blender_undo.c
+++ b/source/blender/blenkernel/intern/blender_undo.c
@@ -78,10 +78,9 @@ bool BKE_memfile_undo_decode(MemFileUndoData *mfu,
if (UNDO_DISK) {
const struct BlendFileReadParams params = {0};
- struct BlendFileData *bfd = BKE_blendfile_read(
- mfu->filename, ¶ms, &(BlendFileReadReport){NULL});
+ struct BlendFileData *bfd = BKE_blendfile_read(mfu->filename, ¶ms, NULL);
if (bfd != NULL) {
- BKE_blendfile_read_setup(C, bfd, ¶ms, &(BlendFileReadReport){NULL});
+ BKE_blendfile_read_setup(C, bfd, ¶ms, NULL);
success = true;
}
}
@@ -94,7 +93,7 @@ bool BKE_memfile_undo_decode(MemFileUndoData *mfu,
struct BlendFileData *bfd = BKE_blendfile_read_from_memfile(
bmain, &mfu->memfile, ¶ms, NULL);
if (bfd != NULL) {
- BKE_blendfile_read_setup(C, bfd, ¶ms, &(BlendFileReadReport){NULL});
+ BKE_blendfile_read_setup(C, bfd, ¶ms, NULL);
success = true;
}
}
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);
diff --git a/source/blender/blenkernel/intern/lib_override.c b/source/blender/blenkernel/intern/lib_override.c
index 270d7ca358a..c93971e7b11 100644
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list