[Bf-blender-cvs] [fab69104da5] sculpt-dev: Sculpt-dev: fix a few bugs in last commit and update some icons

[Joseph Eagar]

Commit: fab69104da57922bae4a101c930ccda5d8795a7d
Author: Joseph Eagar
Date:   Wed Jan 12 02:33:52 2022 -0800
Branches: sculpt-dev
https://developer.blender.org/rBfab69104da57922bae4a101c930ccda5d8795a7d

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.

===================================================================

M	release/datafiles/icons/brush.sculpt.paint.dat
M	release/datafiles/icons/ops.sculpt.color_filter.dat
M	release/datafiles/icons/ops.sculpt.mask_by_color.dat
M	source/blender/editors/sculpt_paint/sculpt_automasking.c

===================================================================

diff --git a/release/datafiles/icons/brush.sculpt.paint.dat b/release/datafiles/icons/brush.sculpt.paint.dat
index ef5f5fe851a..0ec7c7c7052 100644
Binary files a/release/datafiles/icons/brush.sculpt.paint.dat and b/release/datafiles/icons/brush.sculpt.paint.dat differ
diff --git a/release/datafiles/icons/ops.sculpt.color_filter.dat b/release/datafiles/icons/ops.sculpt.color_filter.dat
index ec9b280c79c..9c8fb3c0e92 100644
Binary files a/release/datafiles/icons/ops.sculpt.color_filter.dat and b/release/datafiles/icons/ops.sculpt.color_filter.dat differ
diff --git a/release/datafiles/icons/ops.sculpt.mask_by_color.dat b/release/datafiles/icons/ops.sculpt.mask_by_color.dat
index 3fd4b1ec190..e22b1270a79 100644
Binary files a/release/datafiles/icons/ops.sculpt.mask_by_color.dat and b/release/datafiles/icons/ops.sculpt.mask_by_color.dat differ
diff --git a/source/blender/editors/sculpt_paint/sculpt_automasking.c b/source/blender/editors/sculpt_paint/sculpt_automasking.c
index 0e3e38e2ad0..06aa33a9026 100644
--- a/source/blender/editors/sculpt_paint/sculpt_automasking.c
+++ b/source/blender/editors/sculpt_paint/sculpt_automasking.c
@@ -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++) {