blender
/
blender
134
399
Fork 583
Code Issues 6.3k Pull Requests 755 Projects 19 Wiki Activity

WIP: Brush assets project #106303

Draft
Julian Eisel wants to merge 354 commits from brush-assets-project into main
pull from: brush-assets-project
merge into: blender:main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 8 Commits 354 Files Changed 125 +3 -2
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 335876b4cf - Show all commits

3
source/blender/blenkernel/intern/brush.cc
View File

@ -402,7 +402,8 @@ static void brush_asset_metadata_ensure(void *asset_ptr, AssetMetaData *asset_da
{"use_paint_image", OB_MODE_TEXTURE_PAINT},
{"use_paint_grease_pencil", OB_MODE_PAINT_GPENCIL_LEGACY},
{"use_vertex_grease_pencil", OB_MODE_VERTEX_GPENCIL_LEGACY},
{"use_paint_sculpt_curves", OB_MODE_SCULPT_CURVES}};
{"use_paint_sculpt_curves", OB_MODE_SCULPT_CURVES},
};
for (const auto &mode_mapping : mode_map) {
/* Only add bools for supported modes. */

2
source/blender/blenkernel/intern/idprop_serialize.cc
View File

@ -765,7 +765,7 @@ class IDPUnknownSerializer : public IDPropertySerializer {
/* Serializers are constructed statically to remove construction/destruction. */
static constexpr IDPStringSerializer IDP_SERIALIZER_STRING;
static constexpr IDPIntSerializer IDP_SERIALIZER_BOOL;
static constexpr IDPBoolSerializer IDP_SERIALIZER_BOOL;
static constexpr IDPIntSerializer IDP_SERIALIZER_INT;
static constexpr IDPFloatSerializer IDP_SERIALIZER_FLOAT;
static constexpr IDPDoubleSerializer IDP_SERIALIZER_DOUBLE;