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>2019-05-13 06:25:51 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-05-13 06:25:51 +0300
commita279bbbee56ff941ab4ffc263027a7e154703e93 (patch)
tree793a9acfaea723347f2e447dac91d3ca4224b30d /source/blender/blenkernel/intern/blendfile.c
parentac94c219aea80cb1eb494d03d42762ca5db931f3 (diff)
Preferences: support loading factory preferences
Previously it was only possible to load factory startup & preferences.
Diffstat (limited to 'source/blender/blenkernel/intern/blendfile.c')
-rw-r--r--source/blender/blenkernel/intern/blendfile.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/blendfile.c b/source/blender/blenkernel/intern/blendfile.c
index 160ac36fb61..570c1b9bd4c 100644
--- a/source/blender/blenkernel/intern/blendfile.c
+++ b/source/blender/blenkernel/intern/blendfile.c
@@ -438,7 +438,9 @@ bool BKE_blendfile_read_from_memory(bContext *C,
bfd = BLO_read_from_memory(filebuf, filelength, params->skip_flags, reports);
if (bfd) {
if (update_defaults) {
- BLO_update_defaults_startup_blend(bfd->main, NULL);
+ if ((params->skip_flags & BLO_READ_SKIP_DATA) == 0) {
+ BLO_update_defaults_startup_blend(bfd->main, NULL);
+ }
}
setup_app_blend_file_data(C, bfd, "<memory2>", params, reports);