[Bf-blender-cvs] [daedf193155] master: Sculpt: Fix T103724: missing mask attr existance check for PBVH_GRIDS

[Joseph Eagar]

Commit: daedf19315519d7279b762b72f7cb50bdaf26606
Author: Joseph Eagar
Date:   Thu Jan 12 23:57:01 2023 -0800
Branches: master
https://developer.blender.org/rBdaedf19315519d7279b762b72f7cb50bdaf26606

Sculpt: Fix T103724: missing mask attr existance check for PBVH_GRIDS

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

M	release/datafiles/locale
M	release/scripts/addons
M	release/scripts/addons_contrib
M	source/blender/editors/sculpt_paint/sculpt.cc
M	source/tools

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

diff --git a/release/datafiles/locale b/release/datafiles/locale
index 4f6dbb69893..7084c4ecd97 160000
--- a/release/datafiles/locale
+++ b/release/datafiles/locale
@@ -1 +1 @@
-Subproject commit 4f6dbb69893bd6bdf73467effe77ae46c8e4ee37
+Subproject commit 7084c4ecd97d93459d9d23fd90f81589b09be5df
diff --git a/release/scripts/addons b/release/scripts/addons
index bf49eeaa14c..a9d4443c244 160000
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@ -1 +1 @@
-Subproject commit bf49eeaa14c445d3c53068203fdf91bff568fe64
+Subproject commit a9d4443c244f89399ec4bcc427e05a07950528cc
diff --git a/release/scripts/addons_contrib b/release/scripts/addons_contrib
index 0f72f6c85c3..bdcfdd47ec3 160000
--- a/release/scripts/addons_contrib
+++ b/release/scripts/addons_contrib
@@ -1 +1 @@
-Subproject commit 0f72f6c85c3743a9072273acb6a8a34b1cf1064b
+Subproject commit bdcfdd47ec3451822b21d1cff2ea2db751093c9a
diff --git a/source/blender/editors/sculpt_paint/sculpt.cc b/source/blender/editors/sculpt_paint/sculpt.cc
index e1586e00788..dd3e38258dc 100644
--- a/source/blender/editors/sculpt_paint/sculpt.cc
+++ b/source/blender/editors/sculpt_paint/sculpt.cc
@@ -259,6 +259,11 @@ float SCULPT_vertex_mask_get(SculptSession *ss, PBVHVertRef vertex)
     }
     case PBVH_GRIDS: {
       const CCGKey *key = BKE_pbvh_get_grid_key(ss->pbvh);
+
+      if (key->mask_offset == -1) {
+        return 0.0f;
+      }
+
       const int grid_index = vertex.i / key->grid_area;
       const int vertex_index = vertex.i - grid_index * key->grid_area;
       CCGElem *elem = BKE_pbvh_get_grids(ss->pbvh)[grid_index];
diff --git a/source/tools b/source/tools
index 3582f5326d0..e1744b9bd82 160000
--- a/source/tools
+++ b/source/tools
@@ -1 +1 @@
-Subproject commit 3582f5326d08ca05c2a19056597e49ec5511d854
+Subproject commit e1744b9bd82527cf7e8af63362b61bd309b5711b