diff --git a/source/blender/blenkernel/BKE_blender_version.h b/source/blender/blenkernel/BKE_blender_version.h index 1b0a6e09ba9..68dff4ef2d6 100644 --- a/source/blender/blenkernel/BKE_blender_version.h +++ b/source/blender/blenkernel/BKE_blender_version.h @@ -27,7 +27,7 @@ /* Blender file format version. */ #define BLENDER_FILE_VERSION BLENDER_VERSION -#define BLENDER_FILE_SUBVERSION 89 +#define BLENDER_FILE_SUBVERSION 90 /* Minimum Blender version that supports reading file written with the current * version. Older Blender versions will test this and cancel loading the file, showing a warning to diff --git a/source/blender/blenkernel/intern/blendfile.cc b/source/blender/blenkernel/intern/blendfile.cc index 57522aabd47..8c20c2a5f0b 100644 --- a/source/blender/blenkernel/intern/blendfile.cc +++ b/source/blender/blenkernel/intern/blendfile.cc @@ -1573,6 +1573,24 @@ UserDef *BKE_blendfile_userdef_from_defaults() BKE_preferences_asset_shelf_settings_ensure_catalog_path_enabled( userdef, "VIEW3D_AST_brush_sculpt", "Brushes/Mesh Sculpt/Simulation"); + BKE_preferences_asset_shelf_settings_ensure_catalog_path_enabled( + userdef, "IMAGE_AST_brush_paint", "Brushes/Mesh Texture Paint/Basic"); + BKE_preferences_asset_shelf_settings_ensure_catalog_path_enabled( + userdef, "IMAGE_AST_brush_paint", "Brushes/Mesh Texture Paint/Erase"); + BKE_preferences_asset_shelf_settings_ensure_catalog_path_enabled( + userdef, "IMAGE_AST_brush_paint", "Brushes/Mesh Texture Paint/Pixel Art"); + BKE_preferences_asset_shelf_settings_ensure_catalog_path_enabled( + userdef, "IMAGE_AST_brush_paint", "Brushes/Mesh Texture Paint/Utilities"); + + BKE_preferences_asset_shelf_settings_ensure_catalog_path_enabled( + userdef, "VIEW3D_AST_brush_texture_paint", "Brushes/Mesh Texture Paint/Basic"); + BKE_preferences_asset_shelf_settings_ensure_catalog_path_enabled( + userdef, "VIEW3D_AST_brush_texture_paint", "Brushes/Mesh Texture Paint/Erase"); + BKE_preferences_asset_shelf_settings_ensure_catalog_path_enabled( + userdef, "VIEW3D_AST_brush_texture_paint", "Brushes/Mesh Texture Paint/Pixel Art"); + BKE_preferences_asset_shelf_settings_ensure_catalog_path_enabled( + userdef, "VIEW3D_AST_brush_texture_paint", "Brushes/Mesh Texture Paint/Utilities"); + BKE_preferences_asset_shelf_settings_ensure_catalog_path_enabled( userdef, "VIEW3D_AST_brush_gpencil_paint", "Brushes/Grease Pencil Draw/Draw"); BKE_preferences_asset_shelf_settings_ensure_catalog_path_enabled( diff --git a/source/blender/blenloader/intern/versioning_userdef.cc b/source/blender/blenloader/intern/versioning_userdef.cc index 05a67191fd7..34ba5b50c4b 100644 --- a/source/blender/blenloader/intern/versioning_userdef.cc +++ b/source/blender/blenloader/intern/versioning_userdef.cc @@ -1640,6 +1640,26 @@ void blo_do_versions_userdef(UserDef *userdef) } } + if (!USER_VERSION_ATLEAST(500, 90)) { + BKE_preferences_asset_shelf_settings_ensure_catalog_path_enabled( + userdef, "IMAGE_AST_brush_paint", "Brushes/Mesh Texture Paint/Basic"); + BKE_preferences_asset_shelf_settings_ensure_catalog_path_enabled( + userdef, "IMAGE_AST_brush_paint", "Brushes/Mesh Texture Paint/Erase"); + BKE_preferences_asset_shelf_settings_ensure_catalog_path_enabled( + userdef, "IMAGE_AST_brush_paint", "Brushes/Mesh Texture Paint/Pixel Art"); + BKE_preferences_asset_shelf_settings_ensure_catalog_path_enabled( + userdef, "IMAGE_AST_brush_paint", "Brushes/Mesh Texture Paint/Utilities"); + + BKE_preferences_asset_shelf_settings_ensure_catalog_path_enabled( + userdef, "VIEW3D_AST_brush_texture_paint", "Brushes/Mesh Texture Paint/Basic"); + BKE_preferences_asset_shelf_settings_ensure_catalog_path_enabled( + userdef, "VIEW3D_AST_brush_texture_paint", "Brushes/Mesh Texture Paint/Erase"); + BKE_preferences_asset_shelf_settings_ensure_catalog_path_enabled( + userdef, "VIEW3D_AST_brush_texture_paint", "Brushes/Mesh Texture Paint/Pixel Art"); + BKE_preferences_asset_shelf_settings_ensure_catalog_path_enabled( + userdef, "VIEW3D_AST_brush_texture_paint", "Brushes/Mesh Texture Paint/Utilities"); + } + /** * Always bump subversion in BKE_blender_version.h when adding versioning * code here, and wrap it inside a USER_VERSION_ATLEAST check.