Adding paint brushes crashes w/ linked libs
While we could skip this for linked files, convention so far is to only update startup.
This commit is contained in:
parent
5c6e3ff497
commit
c133927bb8
Notes:
blender-bot
2023-02-14 11:35:46 +01:00
Referenced by commit 64afba0244
, Remove brush versioning (again!)
|
@ -1682,24 +1682,6 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *main)
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
{
|
||||
Brush *br;
|
||||
br = (Brush *)BKE_libblock_find_name_ex(main, ID_BR, "Average");
|
||||
if (!br) {
|
||||
br = BKE_brush_add(main, "Average", OB_MODE_VERTEX_PAINT | OB_MODE_WEIGHT_PAINT);
|
||||
br->vertexpaint_tool = PAINT_BLEND_AVERAGE;
|
||||
br->ob_mode = OB_MODE_VERTEX_PAINT | OB_MODE_WEIGHT_PAINT;
|
||||
}
|
||||
|
||||
br = (Brush *)BKE_libblock_find_name_ex(main, ID_BR, "Smear");
|
||||
if (!br) {
|
||||
br = BKE_brush_add(main, "Smear", OB_MODE_VERTEX_PAINT | OB_MODE_WEIGHT_PAINT);
|
||||
br->vertexpaint_tool = PAINT_BLEND_SMEAR;
|
||||
br->ob_mode = OB_MODE_VERTEX_PAINT | OB_MODE_WEIGHT_PAINT;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -246,6 +246,20 @@ void BLO_update_defaults_startup_blend(Main *bmain)
|
|||
br->ob_mode = OB_MODE_TEXTURE_PAINT;
|
||||
}
|
||||
|
||||
/* Vertex/Weight Paint */
|
||||
br = (Brush *)BKE_libblock_find_name_ex(bmain, ID_BR, "Average");
|
||||
if (!br) {
|
||||
br = BKE_brush_add(bmain, "Average", OB_MODE_VERTEX_PAINT | OB_MODE_WEIGHT_PAINT);
|
||||
br->vertexpaint_tool = PAINT_BLEND_AVERAGE;
|
||||
br->ob_mode = OB_MODE_VERTEX_PAINT | OB_MODE_WEIGHT_PAINT;
|
||||
}
|
||||
br = (Brush *)BKE_libblock_find_name_ex(bmain, ID_BR, "Smear");
|
||||
if (!br) {
|
||||
br = BKE_brush_add(bmain, "Smear", OB_MODE_VERTEX_PAINT | OB_MODE_WEIGHT_PAINT);
|
||||
br->vertexpaint_tool = PAINT_BLEND_SMEAR;
|
||||
br->ob_mode = OB_MODE_VERTEX_PAINT | OB_MODE_WEIGHT_PAINT;
|
||||
}
|
||||
|
||||
br = (Brush *)BKE_libblock_find_name_ex(bmain, ID_BR, "Mask");
|
||||
if (br) {
|
||||
br->imagepaint_tool = PAINT_TOOL_MASK;
|
||||
|
|
Loading…
Reference in New Issue