[Bf-blender-cvs] [95919953af2] sculpt-dev: Sculpt-dev: fix compile error from last merge

[Joseph Eagar]

Commit: 95919953af27c25f6eb847ed73ae81bdda66f4b9
Author: Joseph Eagar
Date:   Tue Jan 18 21:41:13 2022 -0800
Branches: sculpt-dev
https://developer.blender.org/rB95919953af27c25f6eb847ed73ae81bdda66f4b9

Sculpt-dev: fix compile error from last merge

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

M	release/datafiles/locale
M	release/scripts/addons
M	release/scripts/addons_contrib
M	source/blender/editors/geometry/geometry_attributes.cc
M	source/tools

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

diff --git a/release/datafiles/locale b/release/datafiles/locale
index 6ac775c595a..d46eacffd92 160000
--- a/release/datafiles/locale
+++ b/release/datafiles/locale
@@ -1 +1 @@
-Subproject commit 6ac775c595a2dd40684cd6421d24f1f064fe3a6f
+Subproject commit d46eacffd92496ae9702a71dfc4da235eaf7731b
diff --git a/release/scripts/addons b/release/scripts/addons
index 231186d45fe..d4fcda5935c 160000
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@ -1 +1 @@
-Subproject commit 231186d45fe8998729e594a7683fd19d30ce8a2c
+Subproject commit d4fcda5935c5c561e77aadd32a32500cf280dcaa
diff --git a/release/scripts/addons_contrib b/release/scripts/addons_contrib
index 42da56aa737..7936dde9ece 160000
--- a/release/scripts/addons_contrib
+++ b/release/scripts/addons_contrib
@@ -1 +1 @@
-Subproject commit 42da56aa73726710107031787af5eea186797984
+Subproject commit 7936dde9ece881d531b1a2ee6c45ddb56d30038c
diff --git a/source/blender/editors/geometry/geometry_attributes.cc b/source/blender/editors/geometry/geometry_attributes.cc
index 30cec248a4f..1329c162398 100644
--- a/source/blender/editors/geometry/geometry_attributes.cc
+++ b/source/blender/editors/geometry/geometry_attributes.cc
@@ -166,8 +166,8 @@ static void next_color_attr(struct ID *id, CustomDataLayer *layer, bool is_rende
     return;
   }
 
-  AttributeDomainMask domain_mask = ATTR_DOMAIN_MASK_POINT | ATTR_DOMAIN_MASK_CORNER;
-  CustomDataMask type_mask = CD_MASK_PROP_COLOR | CD_MASK_MLOOPCOL;
+  AttributeDomainMask domain_mask = (AttributeDomainMask)(ATTR_DOMAIN_MASK_POINT | ATTR_DOMAIN_MASK_CORNER);
+  CustomDataMask type_mask = (CustomDataMask)(CD_MASK_PROP_COLOR | CD_MASK_MLOOPCOL);
 
   int length = BKE_id_attributes_length(id, domain_mask, type_mask);
   int idx = BKE_id_attribute_index_from_ref(id, ref, domain_mask, type_mask);
@@ -192,7 +192,7 @@ static void next_color_attrs(struct ID *id, CustomDataLayer *layer)
 static int geometry_color_attribute_add_exec(bContext *C, wmOperator *op)
   {
   Object *ob = ED_object_context(C);
-  ID *id = ob->data;
+  ID *id = static_cast<ID*>(ob->data);
 
   char name[MAX_NAME];
   RNA_string_get(op->ptr, "name", name);
@@ -317,7 +317,7 @@ void GEOMETRY_OT_attribute_remove(wmOperatorType *ot)
 static int geometry_color_attribute_remove_exec(bContext *C, wmOperator *op)
 {
   Object *ob = ED_object_context(C);
-  ID *id = ob->data;
+  ID *id = static_cast<ID*>(ob->data);
   CustomDataLayer *layer = BKE_id_attributes_active_color_get(id);
 
   if (layer == NULL) {
@@ -348,7 +348,7 @@ static bool geometry_color_attributes_remove_poll(bContext *C)
   }
 
   Object *ob = ED_object_context(C);
-  ID *data = (ob) ? ob->data : NULL;
+  ID *data = (ob) ? static_cast<ID*>(ob->data) : NULL;
   if (BKE_id_attributes_active_color_get(data) != NULL) {
     return true;
   }
diff --git a/source/tools b/source/tools
index 26bc78162ec..7fd2ed908b4 160000
--- a/source/tools
+++ b/source/tools
@@ -1 +1 @@
-Subproject commit 26bc78162ec89f21453ce3ded7b999bc6649f32b
+Subproject commit 7fd2ed908b4f50140670caf6786e5ed245b79137