[Bf-blender-cvs] [ed550e1da9a] sculpt-dev: Sculpt-dev: fix bugs in recent merge

[Joseph Eagar]

Commit: ed550e1da9a25e3c02802a883268f33ad000e05a
Author: Joseph Eagar
Date:   Sat Apr 9 02:13:21 2022 -0700
Branches: sculpt-dev
https://developer.blender.org/rBed550e1da9a25e3c02802a883268f33ad000e05a

Sculpt-dev: fix bugs in recent merge

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

M	release/datafiles/locale
M	release/scripts/addons
M	source/blender/blenkernel/BKE_attribute.h
M	source/blender/blenkernel/intern/pbvh.c
M	source/blender/editors/sculpt_paint/sculpt_dyntopo.c
M	source/blender/editors/sculpt_paint/sculpt_undo.c
M	source/tools

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

diff --git a/release/datafiles/locale b/release/datafiles/locale
index 63699f96834..716dc02ec30 160000
--- a/release/datafiles/locale
+++ b/release/datafiles/locale
@@ -1 +1 @@
-Subproject commit 63699f968344db7dc853d2c5972325beea44900c
+Subproject commit 716dc02ec30c0810513f7b4adc4ae865ae50c4e6
diff --git a/release/scripts/addons b/release/scripts/addons
index baa581415c7..787ea78f7fa 160000
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@ -1 +1 @@
-Subproject commit baa581415c7ed23d7c45ef873631748135672683
+Subproject commit 787ea78f7fa6f0373d80ba1247768402df93f8ad
diff --git a/source/blender/blenkernel/BKE_attribute.h b/source/blender/blenkernel/BKE_attribute.h
index f3968c0d761..4247e12e6ca 100644
--- a/source/blender/blenkernel/BKE_attribute.h
+++ b/source/blender/blenkernel/BKE_attribute.h
@@ -123,6 +123,7 @@ struct CustomDataLayer *BKE_id_attributes_render_color_get(const struct ID *id);
 void BKE_id_attributes_render_color_set(struct ID *id, struct CustomDataLayer *active_layer);
 
 bool BKE_id_attribute_calc_unique_name(struct ID *id, const char *name, char *outname);
+struct CustomDataLayer *BKE_id_attributes_color_find(const struct ID *id, const char *name);
 
 #ifdef __cplusplus
 }
diff --git a/source/blender/blenkernel/intern/pbvh.c b/source/blender/blenkernel/intern/pbvh.c
index 5b3f50169c5..fdb602f9961 100644
--- a/source/blender/blenkernel/intern/pbvh.c
+++ b/source/blender/blenkernel/intern/pbvh.c
@@ -5301,6 +5301,9 @@ bool BKE_pbvh_get_origvert(
       if (mv->stroke_id != pbvh->stroke_id) {
         mv->stroke_id = pbvh->stroke_id;
 
+        copy_v3_v3(mv->origco, v->co);
+        copy_v3_v3(mv->origno, v->no);
+
         if (pbvh->cd_vert_mask_offset != -1) {
           mv->origmask = (short)(BM_ELEM_CD_GET_FLOAT(v, pbvh->cd_vert_mask_offset) * 65535.0f);
         }
diff --git a/source/blender/editors/sculpt_paint/sculpt_dyntopo.c b/source/blender/editors/sculpt_paint/sculpt_dyntopo.c
index b58c1073309..c73d402057a 100644
--- a/source/blender/editors/sculpt_paint/sculpt_dyntopo.c
+++ b/source/blender/editors/sculpt_paint/sculpt_dyntopo.c
@@ -701,7 +701,10 @@ void SCULPT_dynamic_topology_enable_ex(Main *bmain, Depsgraph *depsgraph, Scene
 #endif
 
   SCULPT_dyntopo_node_layers_add(ss, ob);
-  BKE_pbvh_update_sculpt_verts(ss->pbvh);
+
+  if (ss->pbvh) {
+    BKE_pbvh_update_sculpt_verts(ss->pbvh);
+  }
 
   if (SCULPT_has_persistent_base(ss)) {
     SCULPT_ensure_persistent_layers(ss, ob);
diff --git a/source/blender/editors/sculpt_paint/sculpt_undo.c b/source/blender/editors/sculpt_paint/sculpt_undo.c
index 3224efa65ec..e080715fa28 100644
--- a/source/blender/editors/sculpt_paint/sculpt_undo.c
+++ b/source/blender/editors/sculpt_paint/sculpt_undo.c
@@ -794,7 +794,9 @@ static void sculpt_undo_bmesh_enable(Object *ob, SculptUndoNode *unode, bool is_
   SCULPT_dyntopo_node_layers_add(ss, ob);
   SCULPT_update_customdata_refs(ss, ob);
 
-  BKE_pbvh_update_sculpt_verts(ss->pbvh);
+  if (ss->pbvh) {
+    BKE_pbvh_update_sculpt_verts(ss->pbvh);
+  }
 
   if (!ss->bm_log) {
     /* Restore the BMLog using saved entries. */
diff --git a/source/tools b/source/tools
index 4c1e01e3e30..1e658ca996f 160000
--- a/source/tools
+++ b/source/tools
@@ -1 +1 @@
-Subproject commit 4c1e01e3e309282beb1af3b1eddb2c7f9a666b5d
+Subproject commit 1e658ca996f11e5ff3398d89bd81f5b719304a57