diff options
author | Dalai Felinto <dalai@blender.org> | 2021-10-08 15:30:08 +0300 |
---|---|---|
committer | Dalai Felinto <dalai@blender.org> | 2021-10-08 16:37:43 +0300 |
commit | ff9587d28eab0339e8341673ed90db29a2932a95 (patch) | |
tree | b4890cc46829c15dcb58f1483cbee6e5b31c8025 /source/blender/blenloader/intern | |
parent | ebe23745281e8675a6b45c39f79441a4f896963e (diff) |
User Interface: Use theme alpha for the nodes frames background
This bump subversion.
Diffstat (limited to 'source/blender/blenloader/intern')
-rw-r--r-- | source/blender/blenloader/intern/versioning_300.c | 49 | ||||
-rw-r--r-- | source/blender/blenloader/intern/versioning_userdef.c | 5 |
2 files changed, 32 insertions, 22 deletions
diff --git a/source/blender/blenloader/intern/versioning_300.c b/source/blender/blenloader/intern/versioning_300.c index 34712caf584..e1100fa40c4 100644 --- a/source/blender/blenloader/intern/versioning_300.c +++ b/source/blender/blenloader/intern/versioning_300.c @@ -643,6 +643,19 @@ void do_versions_after_linking_300(Main *bmain, ReportList *UNUSED(reports)) } } } + + if (!MAIN_VERSION_ATLEAST(bmain, 300, 33)) { + /* This was missing from #move_vertex_group_names_to_object_data. */ + LISTBASE_FOREACH (Object *, object, &bmain->objects) { + if (ELEM(object->type, OB_MESH, OB_LATTICE, OB_GPENCIL)) { + /* This uses the fact that the active vertex group index starts counting at 1. */ + if (BKE_object_defgroup_active_index_get(object) == 0) { + BKE_object_defgroup_active_index_set(object, object->actdef); + } + } + } + } + /** * Versioning code until next subversion bump goes here. * @@ -655,16 +668,6 @@ void do_versions_after_linking_300(Main *bmain, ReportList *UNUSED(reports)) */ { /* Keep this block, even when empty. */ - - /* This was missing from #move_vertex_group_names_to_object_data. */ - LISTBASE_FOREACH (Object *, object, &bmain->objects) { - if (ELEM(object->type, OB_MESH, OB_LATTICE, OB_GPENCIL)) { - /* This uses the fact that the active vertex group index starts counting at 1. */ - if (BKE_object_defgroup_active_index_get(object) == 0) { - BKE_object_defgroup_active_index_set(object, object->actdef); - } - } - } } } @@ -1708,18 +1711,7 @@ void blo_do_versions_300(FileData *fd, Library *UNUSED(lib), Main *bmain) } } - /** - * Versioning code until next subversion bump goes here. - * - * \note Be sure to check when bumping the version: - * - "versioning_userdef.c", #blo_do_versions_userdef - * - "versioning_userdef.c", #do_versions_theme - * - * \note Keep this message at the bottom of the function. - */ - { - /* Keep this block, even when empty. */ - + if (!MAIN_VERSION_ATLEAST(bmain, 300, 33)) { for (bScreen *screen = bmain->screens.first; screen; screen = screen->id.next) { LISTBASE_FOREACH (ScrArea *, area, &screen->areabase) { LISTBASE_FOREACH (SpaceLink *, sl, &area->spacedata) { @@ -1742,4 +1734,17 @@ void blo_do_versions_300(FileData *fd, Library *UNUSED(lib), Main *bmain) } } } + + /** + * Versioning code until next subversion bump goes here. + * + * \note Be sure to check when bumping the version: + * - "versioning_userdef.c", #blo_do_versions_userdef + * - "versioning_userdef.c", #do_versions_theme + * + * \note Keep this message at the bottom of the function. + */ + { + /* Keep this block, even when empty. */ + } } diff --git a/source/blender/blenloader/intern/versioning_userdef.c b/source/blender/blenloader/intern/versioning_userdef.c index cd365b6be78..60e202746ff 100644 --- a/source/blender/blenloader/intern/versioning_userdef.c +++ b/source/blender/blenloader/intern/versioning_userdef.c @@ -301,6 +301,11 @@ static void do_versions_theme(const UserDef *userdef, bTheme *btheme) } } + if (!USER_VERSION_ATLEAST(300, 33)) { + /* Adjust the frame node alpha now that it is used differently. */ + btheme->space_node.movie[3] = U_theme_default.space_node.movie[3]; + } + /** * Versioning code until next subversion bump goes here. * |