[Bf-blender-cvs] [974b50d16b1] sculpt-dev: Scupt Expand: Remove unused Face Sets update code

Pablo Dobarro noreply at git.blender.org
Thu Feb 11 20:32:43 CET 2021


Commit: 974b50d16b12acda292dceab34365b2e8560ac59
Author: Pablo Dobarro
Date:   Thu Feb 11 18:55:49 2021 +0100
Branches: sculpt-dev
https://developer.blender.org/rB974b50d16b12acda292dceab34365b2e8560ac59

Scupt Expand: Remove unused Face Sets update code

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

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

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

diff --git a/source/blender/editors/sculpt_paint/sculpt_expand.c b/source/blender/editors/sculpt_paint/sculpt_expand.c
index 6732e9e48d2..38fb063f25b 100644
--- a/source/blender/editors/sculpt_paint/sculpt_expand.c
+++ b/source/blender/editors/sculpt_paint/sculpt_expand.c
@@ -956,40 +956,6 @@ static void sculpt_expand_mask_update_task_cb(void *__restrict userdata,
   }
 }
 
-static void sculpt_expand_face_sets_update_task_cb(void *__restrict userdata,
-                                                   const int i,
-                                                   const TaskParallelTLS *__restrict UNUSED(tls))
-{
-  SculptThreadedTaskData *data = userdata;
-  SculptSession *ss = data->ob->sculpt;
-  PBVHNode *node = data->nodes[i];
-  ExpandCache *expand_cache = ss->expand_cache;
-
-  PBVHVertexIter vd;
-  BKE_pbvh_vertex_iter_begin(ss->pbvh, node, vd, PBVH_ITER_ALL)
-  {
-    const bool enabled = sculpt_expand_state_get(ss, expand_cache, vd.index);
-
-    if (!enabled) {
-      continue;
-    }
-
-    if (expand_cache->falloff_gradient) {
-      SCULPT_vertex_face_set_increase(ss, vd.index, expand_cache->next_face_set);
-    }
-    else {
-      SCULPT_vertex_face_set_set(ss, vd.index, expand_cache->next_face_set);
-    }
-
-    if (vd.mvert) {
-      vd.mvert->flag |= ME_VERT_PBVH_UPDATE;
-    }
-  }
-  BKE_pbvh_vertex_iter_end;
-
-  BKE_pbvh_node_mark_update_mask(node);
-}
-
 static void sculpt_expand_face_sets_update(SculptSession *ss, ExpandCache *expand_cache)
 {
   const int totface = ss->totfaces;
@@ -1158,10 +1124,6 @@ static void sculpt_expand_update_for_vertex(bContext *C, Object *ob, const int v
           0, expand_cache->totnode, &data, sculpt_expand_mask_update_task_cb, &settings);
       break;
     case SCULPT_EXPAND_TARGET_FACE_SETS:
-      /*
-      BLI_task_parallel_range(
-          0, expand_cache->totnode, &data, sculpt_expand_face_sets_update_task_cb, &settings);
-      */
       sculpt_expand_face_sets_update(ss, expand_cache);
       break;
     case SCULPT_EXPAND_TARGET_COLORS:



More information about the Bf-blender-cvs mailing list