Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey@blender.org>2022-03-16 12:57:19 +0300
committerSergey Sharybin <sergey@blender.org>2022-03-18 14:07:08 +0300
commitc3ecfdf40b02f7d12775f1ded2f039d40f1470bb (patch)
tree1819bfb4c77444a82adfc79a7dbbfd5f2679e62e /source/blender/blenkernel
parent2252bc6a5527cd7360d1ccfe7a2d1bc640a8dfa6 (diff)
Cleanup: Compilation warnings
Mainly -Wset-but-unused-variable. Makes default compilation on macOS way less noisy. Differential Revision: https://developer.blender.org/D14357
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r--source/blender/blenkernel/intern/dynamicpaint.c3
-rw-r--r--source/blender/blenkernel/intern/mesh_validate.cc57
-rw-r--r--source/blender/blenkernel/intern/particle_child.c6
3 files changed, 28 insertions, 38 deletions
diff --git a/source/blender/blenkernel/intern/dynamicpaint.c b/source/blender/blenkernel/intern/dynamicpaint.c
index ce07e501897..d70ab8ed606 100644
--- a/source/blender/blenkernel/intern/dynamicpaint.c
+++ b/source/blender/blenkernel/intern/dynamicpaint.c
@@ -5244,7 +5244,6 @@ static void dynamic_paint_effect_shrink_cb(void *__restrict userdata,
PaintPoint *pPoint = &((PaintPoint *)sData->type_data)[index];
const PaintPoint *prevPoint = data->prevPoint;
const float eff_scale = data->eff_scale;
- float totalAlpha = 0.0f;
const int *n_index = sData->adj_data->n_index;
const int *n_target = sData->adj_data->n_target;
@@ -5257,8 +5256,6 @@ static void dynamic_paint_effect_shrink_cb(void *__restrict userdata,
const PaintPoint *pPoint_prev = &prevPoint[n_target[n_idx]];
float a_factor, ea_factor, w_factor;
- totalAlpha += pPoint_prev->e_color[3];
-
/* Check if neighboring point has lower alpha,
* if so, decrease this point's alpha as well. */
if (pPoint->color[3] <= 0.0f && pPoint->e_color[3] <= 0.0f && pPoint->wetness <= 0.0f) {
diff --git a/source/blender/blenkernel/intern/mesh_validate.cc b/source/blender/blenkernel/intern/mesh_validate.cc
index fb526354305..4374659bff8 100644
--- a/source/blender/blenkernel/intern/mesh_validate.cc
+++ b/source/blender/blenkernel/intern/mesh_validate.cc
@@ -1049,41 +1049,40 @@ bool BKE_mesh_validate_all_customdata(CustomData *vdata,
bool BKE_mesh_validate(Mesh *me, const bool do_verbose, const bool cddata_check_mask)
{
- bool is_valid = true;
bool changed;
if (do_verbose) {
CLOG_INFO(&LOG, 0, "MESH: %s", me->id.name + 2);
}
- is_valid &= BKE_mesh_validate_all_customdata(&me->vdata,
- me->totvert,
- &me->edata,
- me->totedge,
- &me->ldata,
- me->totloop,
- &me->pdata,
- me->totpoly,
- cddata_check_mask,
- do_verbose,
- true,
- &changed);
-
- is_valid &= BKE_mesh_validate_arrays(me,
- me->mvert,
- me->totvert,
- me->medge,
- me->totedge,
- me->mface,
- me->totface,
- me->mloop,
- me->totloop,
- me->mpoly,
- me->totpoly,
- me->dvert,
- do_verbose,
- true,
- &changed);
+ BKE_mesh_validate_all_customdata(&me->vdata,
+ me->totvert,
+ &me->edata,
+ me->totedge,
+ &me->ldata,
+ me->totloop,
+ &me->pdata,
+ me->totpoly,
+ cddata_check_mask,
+ do_verbose,
+ true,
+ &changed);
+
+ BKE_mesh_validate_arrays(me,
+ me->mvert,
+ me->totvert,
+ me->medge,
+ me->totedge,
+ me->mface,
+ me->totface,
+ me->mloop,
+ me->totloop,
+ me->mpoly,
+ me->totpoly,
+ me->dvert,
+ do_verbose,
+ true,
+ &changed);
if (changed) {
DEG_id_tag_update(&me->id, ID_RECALC_GEOMETRY_ALL_MODES);
diff --git a/source/blender/blenkernel/intern/particle_child.c b/source/blender/blenkernel/intern/particle_child.c
index 8106ae8b302..5dba4d3f003 100644
--- a/source/blender/blenkernel/intern/particle_child.c
+++ b/source/blender/blenkernel/intern/particle_child.c
@@ -142,9 +142,6 @@ static void do_kink_spiral(ParticleThreadContext *ctx,
float kink_freq = part->kink_freq;
float kink_shape = part->kink_shape;
float kink_axis_random = part->kink_axis_random;
- float rough1 = part->rough1;
- float rough2 = part->rough2;
- float rough_end = part->rough_end;
ParticlePathIterator iter;
ParticleCacheKey *key;
@@ -164,9 +161,6 @@ static void do_kink_spiral(ParticleThreadContext *ctx,
if (ptex) {
kink_amp *= ptex->kink_amp;
kink_freq *= ptex->kink_freq;
- rough1 *= ptex->rough1;
- rough2 *= ptex->rough2;
- rough_end *= ptex->roughe;
}
cut_time = (totkeys - 1) * ptex->length;