blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 750 Projects 19 Wiki Activity

Sculpt-dev: fix a few bugs in last commit 

and update some icons

* Fixed crash in automasking when ss->cache
  is not present.
* Updated color filter icon.
* Use standard brush icon for paint.
This commit is contained in:
Joseph Eagar 2022-01-12 02:33:52 -08:00
parent 5e27ed5f0e
commit fab69104da
4 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
release/datafiles/icons/brush.sculpt.paint.dat
View File

Binary file not shown.

BIN
release/datafiles/icons/ops.sculpt.color_filter.dat
View File

Binary file not shown.

BIN
release/datafiles/icons/ops.sculpt.mask_by_color.dat
View File

Binary file not shown.

12
source/blender/editors/sculpt_paint/sculpt_automasking.c
View File

@ -78,8 +78,7 @@ bool SCULPT_is_automasking_mode_enabled(const SculptSession *ss,
const Brush *br,
const eAutomasking_flag mode)
{
int flag = BKE_brush_channelset_get_int(
ss->cache->channels_final, "automasking", &ss->cache->input_mapping);
int flag = SCULPT_get_int(ss, automasking, sd, br);
return flag & mode;
}
@ -566,10 +565,7 @@ AutomaskingCache *SCULPT_automasking_cache_init(Sculpt *sd, const Brush *brush,
SCULPT_vertex_random_access_ensure(ss);
SCULPT_face_random_access_ensure(ss);
if (ss->custom_layers[SCULPT_SCL_AUTOMASKING]) {
automasking->factorlayer = ss->custom_layers[SCULPT_SCL_AUTOMASKING];
}
else {
if (!ss->custom_layers[SCULPT_SCL_AUTOMASKING]) {
ss->custom_layers[SCULPT_SCL_AUTOMASKING] = MEM_callocN(sizeof(SculptCustomLayer),
"automasking->factorlayer");
@ -580,7 +576,7 @@ AutomaskingCache *SCULPT_automasking_cache_init(Sculpt *sd, const Brush *brush,
ATTR_DOMAIN_POINT,
CD_PROP_FLOAT,
SCULPT_SCL_GET_NAME(SCULPT_SCL_AUTOMASKING),
automasking->factorlayer,
ss->custom_layers[SCULPT_SCL_AUTOMASKING],
&params)) {
// failed
MEM_freeN(ss->custom_layers[SCULPT_SCL_AUTOMASKING]);
@ -590,6 +586,8 @@ AutomaskingCache *SCULPT_automasking_cache_init(Sculpt *sd, const Brush *brush,
}
}
automasking->factorlayer = ss->custom_layers[SCULPT_SCL_AUTOMASKING];
// automasking->factorlayer = SCULPT_attr_ensure_layer()
// automasking->factor = MEM_malloc_arrayN(totvert, sizeof(float), "automask_factor");
for (int i = 0; i < totvert; i++) {