[Bf-blender-cvs] [8a98189bfb0] temp_bmesh_multires: commit before merge

[Joseph Eagar]

Commit: 8a98189bfb015b5778807f807718c7f1b4901e0d
Author: Joseph Eagar
Date:   Sun Mar 7 04:00:14 2021 -0800
Branches: temp_bmesh_multires
https://developer.blender.org/rB8a98189bfb015b5778807f807718c7f1b4901e0d

commit before merge

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

M	source/blender/blenkernel/intern/pbvh_bmesh.c
M	source/blender/makesrna/intern/rna_sculpt_paint.c

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

diff --git a/source/blender/blenkernel/intern/pbvh_bmesh.c b/source/blender/blenkernel/intern/pbvh_bmesh.c
index 48b23c0c85f..27549dcb1ad 100644
--- a/source/blender/blenkernel/intern/pbvh_bmesh.c
+++ b/source/blender/blenkernel/intern/pbvh_bmesh.c
@@ -25,8 +25,9 @@
  1. DONE: Limit number of edges processed per run.
  2. Scale split steps by ratio of long to short edges to
     prevent runaway tesselation.
- 3. Detect and dissole three and four valence vertices that are surrounded by
+ 3. Detect and dissolve three and four valence vertices that are surrounded by
     all tris.
+ 4. Use different (coarser) brush spacing for applying dyntopo 
 
  Drawing improvements:
  4. Build and cache vertex index buffers, to reduce GPU bandwidth
diff --git a/source/blender/makesrna/intern/rna_sculpt_paint.c b/source/blender/makesrna/intern/rna_sculpt_paint.c
index ef9037ccb36..166d03367c2 100644
--- a/source/blender/makesrna/intern/rna_sculpt_paint.c
+++ b/source/blender/makesrna/intern/rna_sculpt_paint.c
@@ -368,6 +368,8 @@ static bool rna_Brush_mode_with_tool_poll(PointerRNA *ptr, PointerRNA value)
   return brush->ob_mode & mode;
 }
 
+void SCULPT_update_flat_vcol_shading(Object *ob, Scene *scene);
+
 static void rna_Sculpt_update(bContext *C, PointerRNA *UNUSED(ptr))
 {
   Scene *scene = CTX_data_scene(C);