blender
/
blender
135
425
Fork 607
Code Issues 6.2k Pull Requests 779 Projects 19 Wiki Activity

New bone color presets #112639

Open
Demeter Dzadik wants to merge 6 commits from Mets/blender:new-bone-colors into blender-v4.0-release
pull from: Mets/blender:new-bone-colors
merge into: blender:blender-v4.0-release

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 2 Commits 6 Files Changed 4 +1 -3
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 1be23bda77 - Show all commits

4
source/blender/blenloader/intern/versioning_userdef.cc
View File

@ -111,9 +111,6 @@ static void do_versions_theme(const UserDef *userdef, bTheme *btheme)
FROM_DEFAULT_V4_UCHAR(space_view3d.asset_shelf.back);
FROM_DEFAULT_V4_UCHAR(space_view3d.asset_shelf.header_back);
}
if (!USER_VERSION_ATLEAST(400, 24)) {
memcpy(btheme->tarm, &U_theme_default.tarm, sizeof(*btheme->tarm)*20);
}
if (!USER_VERSION_ATLEAST(400, 24)) {
FROM_DEFAULT_V4_UCHAR(tui.wcol_list_item.inner_sel);
@ -143,6 +140,7 @@ static void do_versions_theme(const UserDef *userdef, bTheme *btheme)
*/
{
/* Keep this block, even when empty. */
memcpy(btheme->tarm, &U_theme_default.tarm, sizeof(*btheme->tarm) * 20);
}
#undef FROM_DEFAULT_V4_UCHAR