sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Merge branch 'master' into blender2.8

Browse Source
This commit is contained in:
Campbell Barton 2018-02-01 15:18:58 +11:00
commit 70841e58c4
2 changed files with 12 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
release/scripts/startup/bl_ui/space_userpref.py
View File

@ -951,7 +951,7 @@ class USERPREF_PT_theme(Panel):
col = split.column()
for i, ui in enumerate(theme.bone_color_sets, 1):
col.label(text=iface_("Color Set %d:") % 1, translate=False)
col.label(text=iface_("Color Set %d:") % i, translate=False)
row = col.row()

30
source/blender/blenloader/intern/writefile.c
View File

@ -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.