diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-02-01 07:18:58 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-02-01 07:18:58 +0300 |
commit | 70841e58c42ec9381c16db4e98109a3d165cd841 (patch) | |
tree | eea06a7dbace1adcbed2e85206c7c5b9ef566932 /source/blender/blenloader/intern/writefile.c | |
parent | 6ffc6b30aa1477eb09a48d318d2b19d7e068cb23 (diff) | |
parent | 653746f5f829e399fe85b4c1d0707a69ee16b3aa (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenloader/intern/writefile.c')
-rw-r--r-- | source/blender/blenloader/intern/writefile.c | 30 |
1 files changed, 11 insertions, 19 deletions
diff --git a/source/blender/blenloader/intern/writefile.c b/source/blender/blenloader/intern/writefile.c index 78719949afe..228dc4cf377 100644 --- a/source/blender/blenloader/intern/writefile.c +++ b/source/blender/blenloader/intern/writefile.c @@ -1176,7 +1176,7 @@ static void write_renderinfo(WriteData *wd, Main *mainvar) } } -static void write_keymapitem(WriteData *wd, wmKeyMapItem *kmi) +static void write_keymapitem(WriteData *wd, const wmKeyMapItem *kmi) { writestruct(wd, DATA, wmKeyMapItem, 1, kmi); if (kmi->properties) { @@ -1184,26 +1184,18 @@ static void write_keymapitem(WriteData *wd, wmKeyMapItem *kmi) } } -static void write_userdef(WriteData *wd) +static void write_userdef(WriteData *wd, const UserDef *userdef) { - bTheme *btheme; - wmKeyMap *keymap; - wmKeyMapItem *kmi; - wmKeyMapDiffItem *kmdi; - bAddon *bext; - bPathCompare *path_cmp; - uiStyle *style; + writestruct(wd, USER, UserDef, 1, userdef); - writestruct(wd, USER, UserDef, 1, &U); - - for (btheme = U.themes.first; btheme; btheme = btheme->next) { + for (const bTheme *btheme = userdef->themes.first; btheme; btheme = btheme->next) { writestruct(wd, DATA, bTheme, 1, btheme); } - for (keymap = U.user_keymaps.first; keymap; keymap = keymap->next) { + for (const wmKeyMap *keymap = userdef->user_keymaps.first; keymap; keymap = keymap->next) { writestruct(wd, DATA, wmKeyMap, 1, keymap); - for (kmdi = keymap->diff_items.first; kmdi; kmdi = kmdi->next) { + for (const wmKeyMapDiffItem *kmdi = keymap->diff_items.first; kmdi; kmdi = kmdi->next) { writestruct(wd, DATA, wmKeyMapDiffItem, 1, kmdi); if (kmdi->remove_item) { write_keymapitem(wd, kmdi->remove_item); @@ -1213,23 +1205,23 @@ static void write_userdef(WriteData *wd) } } - for (kmi = keymap->items.first; kmi; kmi = kmi->next) { + for (const wmKeyMapItem *kmi = keymap->items.first; kmi; kmi = kmi->next) { write_keymapitem(wd, kmi); } } - for (bext = U.addons.first; bext; bext = bext->next) { + for (const bAddon *bext = userdef->addons.first; bext; bext = bext->next) { writestruct(wd, DATA, bAddon, 1, bext); if (bext->prop) { IDP_WriteProperty(bext->prop, wd); } } - for (path_cmp = U.autoexec_paths.first; path_cmp; path_cmp = path_cmp->next) { + for (const bPathCompare *path_cmp = userdef->autoexec_paths.first; path_cmp; path_cmp = path_cmp->next) { writestruct(wd, DATA, bPathCompare, 1, path_cmp); } - for (style = U.uistyles.first; style; style = style->next) { + for (const uiStyle *style = userdef->uistyles.first; style; style = style->next) { writestruct(wd, DATA, uiStyle, 1, style); } } @@ -4119,7 +4111,7 @@ static bool write_file_handle( mywrite_flush(wd); if (write_flags & G_FILE_USERPREFS) { - write_userdef(wd); + write_userdef(wd, &U); } /* Write DNA last, because (to be implemented) test for which structs are written. |