[Bf-blender-cvs] [ac4f8292d04] sculpt-dev: Sculpt-dev: fix a few warnings
Joseph Eagar
noreply at git.blender.org
Sat Jan 8 22:01:51 CET 2022
Commit: ac4f8292d044a0914de36d48d0c5f395ae550298
Author: Joseph Eagar
Date: Sat Jan 8 13:01:37 2022 -0800
Branches: sculpt-dev
https://developer.blender.org/rBac4f8292d044a0914de36d48d0c5f395ae550298
Sculpt-dev: fix a few warnings
===================================================================
M source/blender/blenkernel/intern/dyntopo.c
M source/blender/blenkernel/intern/pbvh_bmesh.c
===================================================================
diff --git a/source/blender/blenkernel/intern/dyntopo.c b/source/blender/blenkernel/intern/dyntopo.c
index 15b35676bcb..0f6b15aaee3 100644
--- a/source/blender/blenkernel/intern/dyntopo.c
+++ b/source/blender/blenkernel/intern/dyntopo.c
@@ -2202,10 +2202,11 @@ static void long_edge_queue_task_cb(void *__restrict userdata,
BLI_array_append(val34, l_iter->v);
}
- // try to improve convergence by applying a small amount of smoothing to topology,
- // but tangentially to surface.
+ /* try to improve convergence by applying a small amount of smoothing to topology,
+ but tangentially to surface.
+ */
int randval = (seed = dyntopo_thread_rand(seed)) & 255;
-
+
if (do_smooth && randval > 127) {
surface_smooth_v_safe(tdata->pbvh, l_iter->v, eq_ctx->surface_smooth_fac);
}
@@ -3964,7 +3965,6 @@ static BMVert *pbvh_bmesh_collapse_edge(PBVH *pbvh,
BMLoop *lnext;
do {
- BMLoop *l2 = l->f->l_first;
lnext = l->radial_next;
bool fbad = false;
@@ -4716,7 +4716,6 @@ bool BKE_pbvh_bmesh_update_topology(PBVH *pbvh,
#ifdef DYNTOPO_REPORT
{
- size_t totmem;
BMesh *bm = pbvh->bm;
int vmem = (int)((size_t)bm->totvert * (sizeof(BMVert) + bm->vdata.totsize));
diff --git a/source/blender/blenkernel/intern/pbvh_bmesh.c b/source/blender/blenkernel/intern/pbvh_bmesh.c
index efb166bc8a3..a521ecbad73 100644
--- a/source/blender/blenkernel/intern/pbvh_bmesh.c
+++ b/source/blender/blenkernel/intern/pbvh_bmesh.c
@@ -1784,7 +1784,7 @@ void bke_pbvh_update_vert_boundary(int cd_sculpt_vert,
const int totuv)
{
MSculptVert *mv = BKE_PBVH_SCULPTVERT(cd_sculpt_vert, v);
-
+
float curv = 0.0f, totcurv = 0.0f;
int newflag = mv->flag;
More information about the Bf-blender-cvs
mailing list