From dcfe9eed2ffe3258f9e64c651a0609cbb0272127 Mon Sep 17 00:00:00 2001 From: Julian Eisel Date: Fri, 18 Oct 2024 14:12:05 +0200 Subject: [PATCH 1/3] Assets: Update assets repository hash for essentials library updates Asset previews and catalogs for the essentials asset library were changed, see a11acb63e5, 09bd5a5777. --- release/datafiles/assets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release/datafiles/assets b/release/datafiles/assets index 88f1a1caf7f..09bd5a5777f 160000 --- a/release/datafiles/assets +++ b/release/datafiles/assets @@ -1 +1 @@ -Subproject commit 88f1a1caf7f0198b4822e703d839cb3c71cf5333 +Subproject commit 09bd5a5777fb056f33a860acc2d4ae02dfb108df From 3a708a27f969616936a9ae6dd8792e88b5ab5938 Mon Sep 17 00:00:00 2001 From: Julian Eisel Date: Fri, 18 Oct 2024 14:16:58 +0200 Subject: [PATCH 2/3] Sculpt/Paint: Disable asset shelf filtering by tool by default Disables the "Filter Brushes by Tool" toggle of the brush asset shelf options by default. After further feedback, we want to keep this option disabled by default. It's useful to be able to access all brushes from the asset shelf, regardless of what the active tool is. In many cases you'd see the asset shelf with only one brush, which wastes space and isn't a good look design quality wise. The following commit will also enable some more asset catalogs by default which should be useful for filtering brushes, and reduce the need for filtering by active tool. So all things considered, while having this option is useful, it can remain disabled by default. --- source/blender/blenkernel/BKE_blender_version.h | 2 +- source/blender/blenloader/intern/versioning_userdef.cc | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/source/blender/blenkernel/BKE_blender_version.h b/source/blender/blenkernel/BKE_blender_version.h index 4474d002463..30ee358920b 100644 --- a/source/blender/blenkernel/BKE_blender_version.h +++ b/source/blender/blenkernel/BKE_blender_version.h @@ -31,7 +31,7 @@ extern "C" { /* Blender file format version. */ #define BLENDER_FILE_VERSION BLENDER_VERSION -#define BLENDER_FILE_SUBVERSION 31 +#define BLENDER_FILE_SUBVERSION 32 /* 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/blenloader/intern/versioning_userdef.cc b/source/blender/blenloader/intern/versioning_userdef.cc index d3623c085e4..a84d055079c 100644 --- a/source/blender/blenloader/intern/versioning_userdef.cc +++ b/source/blender/blenloader/intern/versioning_userdef.cc @@ -1064,8 +1064,8 @@ void blo_do_versions_userdef(UserDef *userdef) userdef->sequencer_editor_flag |= USER_SEQ_ED_CONNECT_STRIPS_BY_DEFAULT; } - if (!USER_VERSION_ATLEAST(403, 30)) { - userdef->uiflag |= USER_FILTER_BRUSHES_BY_TOOL; + if (!USER_VERSION_ATLEAST(403, 32)) { + userdef->uiflag &= ~USER_FILTER_BRUSHES_BY_TOOL; } /** From c8e75c03c360fd163e5b1e9d99d6dcd036312f57 Mon Sep 17 00:00:00 2001 From: Julian Eisel Date: Fri, 18 Oct 2024 14:37:33 +0200 Subject: [PATCH 3/3] 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"); } /**