[Bf-blender-cvs] [b0b60df3261] refactor-mesh-position-generic: Merge branch 'master' into refactor-mesh-position-generic

[Hans Goudey]

Commit: b0b60df326167411e3be008dac8316623b5dd3b3
Author: Hans Goudey
Date:   Tue Dec 13 16:53:53 2022 -0600
Branches: refactor-mesh-position-generic
https://developer.blender.org/rBb0b60df326167411e3be008dac8316623b5dd3b3

Merge branch 'master' into refactor-mesh-position-generic

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



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

diff --cc source/blender/blenkernel/intern/paint.cc
index 49a9e2e25d4,e6d61ddcdd3..caaf2956ff3
--- a/source/blender/blenkernel/intern/paint.cc
+++ b/source/blender/blenkernel/intern/paint.cc
@@@ -79,8 -75,11 +79,8 @@@ static SculptAttribute *sculpt_attribut
                                                     const SculptAttributeParams *params,
                                                     PBVHType pbvhtype,
                                                     bool flat_array_for_bmesh);
- void sculptsession_bmesh_add_layers(Object *ob);
+ static void sculptsession_bmesh_add_layers(Object *ob);
  
 -using blender::MutableSpan;
 -using blender::Span;
 -
  static void palette_init_data(ID *id)
  {
    Palette *palette = (Palette *)id;