[Bf-blender-cvs] [bae92a0ce5d] sculpt-dev: Disable threading for sculpt project brush

[Joseph Eagar]

Commit: bae92a0ce5d00172dc39c0e676d4ea69688c46b9
Author: Joseph Eagar
Date:   Sat Sep 18 01:39:40 2021 -0700
Branches: sculpt-dev
https://developer.blender.org/rBbae92a0ce5d00172dc39c0e676d4ea69688c46b9

Disable threading for sculpt project brush

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

M	source/blender/editors/sculpt_paint/sculpt.c
M	source/blender/editors/transform/transform_snap_object.c

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

diff --git a/source/blender/editors/sculpt_paint/sculpt.c b/source/blender/editors/sculpt_paint/sculpt.c
index 73b79e8a11e..dd1ab2ef557 100644
--- a/source/blender/editors/sculpt_paint/sculpt.c
+++ b/source/blender/editors/sculpt_paint/sculpt.c
@@ -5214,7 +5214,7 @@ static void do_scene_project_brush(Sculpt *sd, Object *ob, PBVHNode **nodes, int
   };
 
   TaskParallelSettings settings;
-  BKE_pbvh_parallel_range_settings(&settings, true, totnode);
+  BKE_pbvh_parallel_range_settings(&settings, false, totnode);
   BLI_task_parallel_range(0, totnode, &data, do_scene_project_brush_task_cb_ex, &settings);
 }
 
diff --git a/source/blender/editors/transform/transform_snap_object.c b/source/blender/editors/transform/transform_snap_object.c
index 811f30c96e5..3efb02f1910 100644
--- a/source/blender/editors/transform/transform_snap_object.c
+++ b/source/blender/editors/transform/transform_snap_object.c
@@ -253,10 +253,10 @@ static SnapObjectData *snap_object_data_lookup(SnapObjectContext *sctx, Object *
   return sod;
 }
 
-static SnapObjectData *snap_object_data_mesh_get(SnapObjectContext *sctx,
-                                                 Object *ob_eval,
-                                                 const Mesh *me_eval,
-                                                 bool use_hide)
+ATTR_NO_OPT static SnapObjectData *snap_object_data_mesh_get(SnapObjectContext *sctx,
+                                                             Object *ob_eval,
+                                                             const Mesh *me_eval,
+                                                             bool use_hide)
 {
   SnapObjectData *sod;
   void **sod_p;