[Bf-blender-cvs] [ae19d5303a3] sculpt-dev: Sculpt Expand: Fix Face Set ID constantly updated when moving

[Pablo Dobarro]

Commit: ae19d5303a35c486193844962c1804e372b8f163
Author: Pablo Dobarro
Date:   Thu Feb 11 20:05:29 2021 +0100
Branches: sculpt-dev
https://developer.blender.org/rBae19d5303a35c486193844962c1804e372b8f163

Sculpt Expand: Fix Face Set ID constantly updated when moving

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

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 5ced94b7207..f524697fa87 100644
--- a/source/blender/editors/sculpt_paint/sculpt_expand.c
+++ b/source/blender/editors/sculpt_paint/sculpt_expand.c
@@ -1281,11 +1281,13 @@ static void sculpt_expand_set_initial_components_for_mouse(bContext *C,
   copy_v2_v2(ss->expand_cache->initial_mouse, mouse);
   expand_cache->initial_active_vertex = initial_vertex;
   expand_cache->initial_active_face_set = SCULPT_active_face_set_get(ss);
-  if (expand_cache->modify_active) {
-    expand_cache->next_face_set = SCULPT_active_face_set_get(ss);
-  }
-  else {
-    expand_cache->next_face_set = ED_sculpt_face_sets_find_next_available_id(ob->data);
+  if (expand_cache->next_face_set == SCULPT_FACE_SET_NONE) {
+    if (expand_cache->modify_active) {
+      expand_cache->next_face_set = SCULPT_active_face_set_get(ss);
+    }
+    else {
+      expand_cache->next_face_set = ED_sculpt_face_sets_find_next_available_id(ob->data);
+    }
   }
   sculpt_expand_find_active_connected_components_from_vert(ob, expand_cache, initial_vertex);
 }