Details

Reviewers

Bastien Montagne (mont29)
Brecht Van Lommel (brecht)

Maniphest Tasks

T67097: Don't use startup.blend for reading preferences

Summary

Simplify startup/preferences settings by moving it to a struct.

Remove preferences from startup.blend save/loading (only use userpref.blend).
Removes the need for BLO_update_defaults_userpref_blend except for some system spesific values.
Move preferences to a struct definition.

Useful for defaults once D4500: DNA Defaults are supported.

Diff Detail

Repository

rB Blender

Branch

TEMP-USERDEF-FROM-MEMORY (branched from master)

Build Status

Buildable 4214
Build 4214: arc lint + arc unit

Event Timeline

Campbell Barton (campbellbarton) created this revision.Jul 30 2019, 5:25 AM

Harbormaster completed remote builds in B4206: Diff 16671.Jul 30 2019, 5:25 AM

Minor update

Harbormaster completed remote builds in B4207: Diff 16672.Jul 30 2019, 5:28 AM

Fix check for skipping preferences

Harbormaster completed remote builds in B4208: Diff 16673.Jul 30 2019, 5:40 AM

Campbell Barton (campbellbarton) edited the summary of this revision. (Show Details)Jul 30 2019, 6:24 AM

Campbell Barton (campbellbarton) edited the summary of this revision. (Show Details)

Use constants

Harbormaster completed remote builds in B4209: Diff 16674.Jul 30 2019, 6:27 AM

Remove versioning code

Harbormaster completed remote builds in B4210: Diff 16675.Jul 30 2019, 6:45 AM

Correct comment

Harbormaster completed remote builds in B4211: Diff 16676.Jul 30 2019, 6:49 AM

Campbell Barton (campbellbarton) edited the summary of this revision. (Show Details)Jul 30 2019, 6:49 AM

Campbell Barton (campbellbarton) edited the summary of this revision. (Show Details)

Correct variable name

Harbormaster completed remote builds in B4212: Diff 16677.Jul 30 2019, 6:52 AM

Campbell Barton (campbellbarton) added a task: T67097: Don't use startup.blend for reading preferences.Jul 30 2019, 7:16 AM

Campbell Barton (campbellbarton) added a reviewer: Bastien Montagne (mont29).

Replace magic number

Harbormaster completed remote builds in B4213: Diff 16678.Jul 30 2019, 7:25 AM

Don't use magic numbers

Harbormaster completed remote builds in B4214: Diff 16679.Jul 30 2019, 7:31 AM

Campbell Barton (campbellbarton) added a reviewer: Brecht Van Lommel (brecht).Jul 30 2019, 11:08 PM

It's not clear to me why enabling of add-ons is done separately from other defaults.

Could we just call BLO_update_defaults_userpref_blend immediately from BKE_blendfile_userdef_from_defaults?

This revision is now accepted and ready to land.Jul 30 2019, 11:54 PM

Those can be refactored after, since there is some chance for those changes to back-fire.

Committed in rB07499c04f612: Preferences: don't store preferences in the startup.

Campbell Barton (campbellbarton) mentioned this in T67097: Don't use startup.blend for reading preferences.Aug 30 2019, 8:40 AM

Preferences: disable loading from the startup.blend
ClosedPublic
Actions

Details

Diff Detail

Event Timeline

Revision Contents
Changeset List

Diff 16679

release/datafiles/userdef/userdef_default.c

source/blender/blenkernel/BKE_blendfile.h

source/blender/blenkernel/CMakeLists.txt

source/blender/blenkernel/intern/blendfile.c

source/blender/blenloader/BLO_readfile.h

source/blender/blenloader/intern/versioning_defaults.c

source/blender/windowmanager/intern/wm_files.c

Preferences: disable loading from the startup.blendClosedPublicActions

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 16679

release/datafiles/userdef/userdef_default.c

source/blender/blenkernel/BKE_blendfile.h

source/blender/blenkernel/CMakeLists.txt

source/blender/blenkernel/intern/blendfile.c

source/blender/blenloader/BLO_readfile.h

source/blender/blenloader/intern/versioning_defaults.c

source/blender/windowmanager/intern/wm_files.c

Preferences: disable loading from the startup.blend
ClosedPublic
Actions

Revision Contents
Changeset List