[Bf-blender-cvs] [f7e062ef3e7] sculpt-dev: Sculpt: fix pose and expand floodfill initial vertex
Pablo Dobarro
noreply at git.blender.org
Sun Feb 7 17:50:15 CET 2021
Commit: f7e062ef3e7f4c19fdff95b94efd54fa9ab43c35
Author: Pablo Dobarro
Date: Sun Feb 7 17:45:28 2021 +0100
Branches: sculpt-dev
https://developer.blender.org/rBf7e062ef3e7f4c19fdff95b94efd54fa9ab43c35
Sculpt: fix pose and expand floodfill initial vertex
===================================================================
M source/blender/editors/sculpt_paint/sculpt.c
M source/blender/editors/sculpt_paint/sculpt_expand.c
M source/blender/editors/sculpt_paint/sculpt_intern.h
===================================================================
diff --git a/source/blender/editors/sculpt_paint/sculpt.c b/source/blender/editors/sculpt_paint/sculpt.c
index f1c2126e8b1..a406133d7c8 100644
--- a/source/blender/editors/sculpt_paint/sculpt.c
+++ b/source/blender/editors/sculpt_paint/sculpt.c
@@ -1125,6 +1125,11 @@ void SCULPT_floodfill_init(SculptSession *ss, SculptFloodFill *flood)
}
void SCULPT_floodfill_add_initial(SculptFloodFill *flood, int index)
+{
+ BLI_gsqueue_push(flood->queue, &index);
+}
+
+void SCULPT_floodfill_add_and_skip_initial(SculptFloodFill *flood, int index)
{
BLI_gsqueue_push(flood->queue, &index);
BLI_BITMAP_ENABLE(flood->visited_vertices, index);
diff --git a/source/blender/editors/sculpt_paint/sculpt_expand.c b/source/blender/editors/sculpt_paint/sculpt_expand.c
index fbe961d0300..37e90c722b7 100644
--- a/source/blender/editors/sculpt_paint/sculpt_expand.c
+++ b/source/blender/editors/sculpt_paint/sculpt_expand.c
@@ -603,7 +603,7 @@ static void sculpt_expand_topology_from_state_boundary(Object *ob,
if (!BLI_BITMAP_TEST(boundary_vertices, i)) {
continue;
}
- SCULPT_floodfill_add_initial(&flood, i);
+ SCULPT_floodfill_add_and_skip_initial(&flood, i);
}
MEM_freeN(boundary_vertices);
diff --git a/source/blender/editors/sculpt_paint/sculpt_intern.h b/source/blender/editors/sculpt_paint/sculpt_intern.h
index f65efb9c79f..380e78595fe 100644
--- a/source/blender/editors/sculpt_paint/sculpt_intern.h
+++ b/source/blender/editors/sculpt_paint/sculpt_intern.h
@@ -304,6 +304,7 @@ void SCULPT_floodfill_add_initial_with_symmetry(struct Sculpt *sd,
int index,
float radius);
void SCULPT_floodfill_add_initial(SculptFloodFill *flood, int index);
+void SCULPT_floodfill_add_and_skip_initial(SculptFloodFill *flood, int index);
void SCULPT_floodfill_execute(
struct SculptSession *ss,
SculptFloodFill *flood,
More information about the Bf-blender-cvs
mailing list