Commit: 0c4a9085f89c956952575868f915f45beb8831a2
Author: Hans Goudey
Date: Wed Aug 26 17:12:39 2020 -0500
Branches: property-search-ui-v2
https://developer.blender.org/rB0c4a9085f89c956952575868f915f45beb8831a2
Merge branch 'master' into property-search-ui-v2
===================================================================
===================================================================
diff --cc source/blender/blenloader/intern/versioning_userdef.c
index 778fa0472f1,d04907872b7..5c1bf3b022a
--- a/source/blender/blenloader/intern/versioning_userdef.c
+++ b/source/blender/blenloader/intern/versioning_userdef.c
@@@ -228,7 -228,11 +228,12 @@@ static void do_versions_theme(const Use
*/
{
/* Keep this block, even when empty. */
+ FROM_DEFAULT_V4_UCHAR(space_properties.search_match_color);
+
+ /* The new defaults for the file browser theme are the same as
+ * the outliner's, and it's less disruptive to just copy them. */
+ copy_v4_v4_uchar(btheme->space_file.back, btheme->space_outliner.back);
+ copy_v4_v4_uchar(btheme->space_file.row_alternate,
btheme->space_outliner.row_alternate);
}
#undef FROM_DEFAULT_V4_UCHAR
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
