[Bf-blender-cvs] [0aac26fd2e4] sculpt-dev: Sculpt: fix sharp brush, new experimental mode was being enabled when it shouldn't be

Joseph Eagar noreply at git.blender.org
Fri Oct 8 09:29:10 CEST 2021


Commit: 0aac26fd2e457ab7148851257ddb28aedbae2733
Author: Joseph Eagar
Date:   Fri Oct 8 00:28:32 2021 -0700
Branches: sculpt-dev
https://developer.blender.org/rB0aac26fd2e457ab7148851257ddb28aedbae2733

Sculpt: fix sharp brush, new experimental
        mode was being enabled when it
	shouldn't be

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

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

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

diff --git a/source/blender/editors/sculpt_paint/sculpt.c b/source/blender/editors/sculpt_paint/sculpt.c
index 7dc24487a68..0e86caadb50 100644
--- a/source/blender/editors/sculpt_paint/sculpt.c
+++ b/source/blender/editors/sculpt_paint/sculpt.c
@@ -5261,9 +5261,9 @@ static void do_draw_brush(Sculpt *sd, Object *ob, PBVHNode **nodes, int totnode)
   BLI_task_parallel_range(0, totnode, &data, do_draw_brush_task_cb_ex, &settings);
 }
 
-static void do_draw_sharp_brush_task_cb_ex_plane(void *__restrict userdata,
-                                                 const int n,
-                                                 const TaskParallelTLS *__restrict tls)
+static void do_draw_sharp_brush_task_cb_ex(void *__restrict userdata,
+                                           const int n,
+                                           const TaskParallelTLS *__restrict tls)
 {
   SculptThreadedTaskData *data = userdata;
   SculptSession *ss = data->ob->sculpt;
@@ -5320,9 +5320,9 @@ static void do_draw_sharp_brush_task_cb_ex_plane(void *__restrict userdata,
   BKE_pbvh_node_mark_update(data->nodes[n]);
 }
 
-static void do_draw_sharp_brush_task_cb_ex(void *__restrict userdata,
-                                           const int n,
-                                           const TaskParallelTLS *__restrict tls)
+static void do_draw_sharp_brush_task_cb_ex_plane(void *__restrict userdata,
+                                                 const int n,
+                                                 const TaskParallelTLS *__restrict tls)
 {
   SculptThreadedTaskData *data = userdata;
   SculptSession *ss = data->ob->sculpt;



More information about the Bf-blender-cvs mailing list