From c8e75c03c360fd163e5b1e9d99d6dcd036312f57 Mon Sep 17 00:00:00 2001 From: Julian Eisel Date: Fri, 18 Oct 2024 14:37:33 +0200 Subject: [PATCH] Grease Pencil: Enable available catalogs by default in asset shelf In grease pencil draw mode, enable the Draw, Erase and Utilities catalogs by default for the asset shelf, meaning they will show up as tabs in the shelf. For grease pencil sculpt mode it's the Contrast, Transform and Utilities mode (consistent with mesh sculpt mode). This makes the assets of the corresponding types easily available, even without requiring the "Filter Brushes by Tool" asset shelf option enabled. It also makes the catalogs and the contained brushes more discoverable as an organization helper. These catalogs were added in 09bd5a5777. --- source/blender/blenkernel/intern/blendfile.cc | 14 ++++++++++++++ .../blenloader/intern/versioning_userdef.cc | 14 ++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/source/blender/blenkernel/intern/blendfile.cc b/source/blender/blenkernel/intern/blendfile.cc index 4cbf89c82dc..4061829dbe5 100644 --- a/source/blender/blenkernel/intern/blendfile.cc +++ b/source/blender/blenkernel/intern/blendfile.cc @@ -1498,6 +1498,20 @@ UserDef *BKE_blendfile_userdef_from_defaults() userdef, "VIEW3D_AST_brush_sculpt", "Brushes/Mesh Sculpt/General"); BKE_preferences_asset_shelf_settings_ensure_catalog_path_enabled( userdef, "VIEW3D_AST_brush_sculpt", "Brushes/Mesh Sculpt/Paint"); + + 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( + userdef, "VIEW3D_AST_brush_gpencil_paint", "Brushes/Grease Pencil Draw/Erase"); + BKE_preferences_asset_shelf_settings_ensure_catalog_path_enabled( + userdef, "VIEW3D_AST_brush_gpencil_paint", "Brushes/Grease Pencil Draw/Utilities"); + + BKE_preferences_asset_shelf_settings_ensure_catalog_path_enabled( + userdef, "VIEW3D_AST_brush_gpencil_sculpt", "Brushes/Grease Pencil Sculpt/Contrast"); + BKE_preferences_asset_shelf_settings_ensure_catalog_path_enabled( + userdef, "VIEW3D_AST_brush_gpencil_sculpt", "Brushes/Grease Pencil Sculpt/Transform"); + BKE_preferences_asset_shelf_settings_ensure_catalog_path_enabled( + userdef, "VIEW3D_AST_brush_gpencil_sculpt", "Brushes/Grease Pencil Sculpt/Utilities"); } return userdef; diff --git a/source/blender/blenloader/intern/versioning_userdef.cc b/source/blender/blenloader/intern/versioning_userdef.cc index a84d055079c..07bf1095067 100644 --- a/source/blender/blenloader/intern/versioning_userdef.cc +++ b/source/blender/blenloader/intern/versioning_userdef.cc @@ -1066,6 +1066,20 @@ void blo_do_versions_userdef(UserDef *userdef) if (!USER_VERSION_ATLEAST(403, 32)) { userdef->uiflag &= ~USER_FILTER_BRUSHES_BY_TOOL; + + 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( + userdef, "VIEW3D_AST_brush_gpencil_paint", "Brushes/Grease Pencil Draw/Erase"); + BKE_preferences_asset_shelf_settings_ensure_catalog_path_enabled( + userdef, "VIEW3D_AST_brush_gpencil_paint", "Brushes/Grease Pencil Draw/Utilities"); + + BKE_preferences_asset_shelf_settings_ensure_catalog_path_enabled( + userdef, "VIEW3D_AST_brush_gpencil_sculpt", "Brushes/Grease Pencil Sculpt/Contrast"); + BKE_preferences_asset_shelf_settings_ensure_catalog_path_enabled( + userdef, "VIEW3D_AST_brush_gpencil_sculpt", "Brushes/Grease Pencil Sculpt/Transform"); + BKE_preferences_asset_shelf_settings_ensure_catalog_path_enabled( + userdef, "VIEW3D_AST_brush_gpencil_sculpt", "Brushes/Grease Pencil Sculpt/Utilities"); } /**