[Bf-blender-cvs] [527c81c6f84] master: Merge branch 'blender-v2.83-release'

Pablo Dobarro noreply at git.blender.org
Tue May 5 17:16:56 CEST 2020


Commit: 527c81c6f841c24c11c4d61fe2f36a0e6a01bbe0
Author: Pablo Dobarro
Date:   Tue May 5 17:16:27 2020 +0200
Branches: master
https://developer.blender.org/rB527c81c6f841c24c11c4d61fe2f36a0e6a01bbe0

Merge branch 'blender-v2.83-release'

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



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

diff --cc source/blender/editors/sculpt_paint/sculpt.c
index ce5433f680e,69345b70d1c..9c026ce9be1
--- a/source/blender/editors/sculpt_paint/sculpt.c
+++ b/source/blender/editors/sculpt_paint/sculpt.c
@@@ -5310,17 -5310,10 +5326,10 @@@ static void do_brush_action(Sculpt *sd
          .nodes = nodes,
      };
  
 -    PBVHParallelSettings settings;
 +    TaskParallelSettings settings;
      BKE_pbvh_parallel_range_settings(&settings, (sd->flags & SCULPT_USE_OPENMP), totnode);
 -    BKE_pbvh_parallel_range(0, totnode, &task_data, do_brush_action_task_cb, &settings);
 +    BLI_task_parallel_range(0, totnode, &task_data, do_brush_action_task_cb, &settings);
  
-     /* Draw Face Sets in draw mode makes a single undo push, in alt-smooth mode deforms the
-      * vertices and uses regular coords undo. */
-     if (brush->sculpt_tool == SCULPT_TOOL_DRAW_FACE_SETS && ss->cache->first_time &&
-         ss->cache->mirror_symmetry_pass == 0 && !ss->cache->alt_smooth) {
-       SCULPT_undo_push_node(ob, nodes[0], SCULPT_UNDO_FACE_SETS);
-     }
- 
      if (sculpt_brush_needs_normal(ss, brush)) {
        update_sculpt_normal(sd, ob, nodes, totnode);
      }



More information about the Bf-blender-cvs mailing list