[Bf-blender-cvs] [c12e3ff1834] sculpt-dev: sculpt-dev: fix pmap ref count bug

[Joseph Eagar]

Commit: c12e3ff183444a43d52ab47b0effabd5b255f4dc
Author: Joseph Eagar
Date:   Wed Jun 1 19:45:59 2022 -0700
Branches: sculpt-dev
https://developer.blender.org/rBc12e3ff183444a43d52ab47b0effabd5b255f4dc

sculpt-dev: fix pmap ref count bug

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

M	source/blender/blenkernel/BKE_pbvh.h
M	source/blender/blenkernel/intern/paint.c
M	source/blender/blenkernel/intern/pbvh.c

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

diff --git a/source/blender/blenkernel/BKE_pbvh.h b/source/blender/blenkernel/BKE_pbvh.h
index 7f277908c07..bf48211f05f 100644
--- a/source/blender/blenkernel/BKE_pbvh.h
+++ b/source/blender/blenkernel/BKE_pbvh.h
@@ -884,7 +884,6 @@ void BKE_pbvh_is_drawing_set(PBVH *pbvh, bool val);
 void BKE_pbvh_node_num_loops(PBVH *pbvh, PBVHNode *node, int *r_totloop);
 
 void BKE_pbvh_update_active_vcol(PBVH *pbvh, const struct Mesh *mesh);
-void BKE_pbvh_pmap_set(PBVH *pbvh, struct SculptPMap *pmap);
 
 void BKE_pbvh_vertex_color_set(PBVH *pbvh, SculptVertRef vertex, const float color[4]);
 void BKE_pbvh_vertex_color_get(const PBVH *pbvh, SculptVertRef vertex, float r_color[4]);
diff --git a/source/blender/blenkernel/intern/paint.c b/source/blender/blenkernel/intern/paint.c
index 6cc4d7e2d0b..ecb06ede1ba 100644
--- a/source/blender/blenkernel/intern/paint.c
+++ b/source/blender/blenkernel/intern/paint.c
@@ -2810,7 +2810,7 @@ PBVH *BKE_sculpt_object_pbvh_ensure(Depsgraph *depsgraph, Object *ob)
 #endif
   }
 
-  BKE_pbvh_pmap_set(pbvh, ob->sculpt->pmap);
+  BKE_pbvh_set_pmap(pbvh, ob->sculpt->pmap);
 
   ob->sculpt->pbvh = pbvh;
 
diff --git a/source/blender/blenkernel/intern/pbvh.c b/source/blender/blenkernel/intern/pbvh.c
index ee02093dba2..5bdefdcaefa 100644
--- a/source/blender/blenkernel/intern/pbvh.c
+++ b/source/blender/blenkernel/intern/pbvh.c
@@ -5223,11 +5223,6 @@ void BKE_pbvh_update_active_vcol(PBVH *pbvh, const Mesh *mesh)
   }
 }
 
-void BKE_pbvh_pmap_set(PBVH *pbvh, SculptPMap *pmap)
-{
-  pbvh->pmap = pmap;
-}
-
 void BKE_pbvh_ensure_node_loops(PBVH *pbvh)
 {
   BLI_assert(BKE_pbvh_type(pbvh) == PBVH_FACES);