[Bf-blender-cvs] [66595e29e21] master: Cleanup: remove/comment unused code, simplify casts
Campbell Barton
noreply at git.blender.org
Thu Jan 19 07:31:50 CET 2023
Commit: 66595e29e21b1c8b4397b8deaa91b07b5e1d9810
Author: Campbell Barton
Date: Thu Jan 19 17:07:29 2023 +1100
Branches: master
https://developer.blender.org/rB66595e29e21b1c8b4397b8deaa91b07b5e1d9810
Cleanup: remove/comment unused code, simplify casts
Remove simple counters where they aren't used, comment in some cases.
Also add missing include.
===================================================================
M source/blender/blenkernel/intern/curveprofile.cc
M source/blender/blenkernel/intern/customdata.cc
M source/blender/blenkernel/intern/gpencil.c
M source/blender/blenkernel/intern/gpencil_curve.c
M source/blender/blenkernel/intern/layer.cc
M source/blender/blenkernel/intern/paint.cc
M source/blender/blenlib/intern/scanfill_utils.c
M source/blender/blenlib/tests/BLI_task_test.cc
M source/blender/bmesh/intern/bmesh_interp.c
M source/blender/bmesh/tools/bmesh_intersect.c
M source/blender/draw/engines/compositor/compositor_engine.cc
M source/blender/draw/engines/workbench/workbench_shader.cc
M source/blender/editors/animation/fmodifier_ui.c
M source/blender/editors/interface/interface_layout.cc
M source/blender/editors/interface/interface_templates.cc
M source/blender/editors/mesh/editmesh_rip.c
M source/blender/editors/screen/area.c
M source/blender/editors/space_node/node_relationships.cc
M source/blender/editors/uvedit/uvedit_islands.cc
M source/blender/freestyle/intern/stroke/Operators.cpp
M source/blender/geometry/intern/uv_parametrizer.cc
M source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.cc
M source/blender/makesrna/intern/rna_path.cc
M source/blender/modifiers/intern/MOD_solidify_nonmanifold.c
M source/blender/render/intern/pipeline.cc
M source/blender/render/intern/render_result.cc
===================================================================
diff --git a/source/blender/blenkernel/intern/curveprofile.cc b/source/blender/blenkernel/intern/curveprofile.cc
index db0cf16d467..11fc4238e6a 100644
--- a/source/blender/blenkernel/intern/curveprofile.cc
+++ b/source/blender/blenkernel/intern/curveprofile.cc
@@ -760,6 +760,7 @@ static void create_samples(CurveProfile *profile,
}
BLI_assert(n_added == n_segments); /* n_added is just used for this assert, could remove it. */
+ UNUSED_VARS_NDEBUG(n_added);
/* Sample the points and add them to the locations table. */
for (int i_sample = 0, i = 0; i < totedges; i++) {
diff --git a/source/blender/blenkernel/intern/customdata.cc b/source/blender/blenkernel/intern/customdata.cc
index b9e6b1c5e6d..227c1ee1bee 100644
--- a/source/blender/blenkernel/intern/customdata.cc
+++ b/source/blender/blenkernel/intern/customdata.cc
@@ -5284,7 +5284,6 @@ const blender::CPPType *custom_data_type_to_cpp_type(const eCustomDataType type)
default:
return nullptr;
}
- return nullptr;
}
eCustomDataType cpp_type_to_custom_data_type(const blender::CPPType &type)
diff --git a/source/blender/blenkernel/intern/gpencil.c b/source/blender/blenkernel/intern/gpencil.c
index 5409bf61274..97e3ff43cd9 100644
--- a/source/blender/blenkernel/intern/gpencil.c
+++ b/source/blender/blenkernel/intern/gpencil.c
@@ -1566,7 +1566,6 @@ bGPDlayer *BKE_gpencil_layer_active_get(bGPdata *gpd)
bGPDlayer *BKE_gpencil_layer_get_by_name(bGPdata *gpd, char *name, int first_if_not_found)
{
bGPDlayer *gpl;
- int i = 0;
/* error checking */
if (ELEM(NULL, gpd, gpd->layers.first)) {
@@ -1578,7 +1577,6 @@ bGPDlayer *BKE_gpencil_layer_get_by_name(bGPdata *gpd, char *name, int first_if_
if (STREQ(name, gpl->info)) {
return gpl;
}
- i++;
}
/* no such layer */
diff --git a/source/blender/blenkernel/intern/gpencil_curve.c b/source/blender/blenkernel/intern/gpencil_curve.c
index a0a579e6d65..bf73b9d6ed6 100644
--- a/source/blender/blenkernel/intern/gpencil_curve.c
+++ b/source/blender/blenkernel/intern/gpencil_curve.c
@@ -971,7 +971,7 @@ static float *gpencil_stroke_points_from_editcurve_adaptive_resolu(
MEM_freeN(segment_point_lengths);
*r_points_len = points_len;
- return (float(*))r_points;
+ return (float *)r_points;
}
/**
@@ -1012,7 +1012,7 @@ static float *gpencil_stroke_points_from_editcurve_fixed_resolu(bGPDcurve_point
}
*r_points_len = points_len;
- return (float(*))r_points;
+ return (float *)r_points;
}
void BKE_gpencil_stroke_update_geometry_from_editcurve(bGPDstroke *gps,
diff --git a/source/blender/blenkernel/intern/layer.cc b/source/blender/blenkernel/intern/layer.cc
index 40b80ddbd10..9e452662055 100644
--- a/source/blender/blenkernel/intern/layer.cc
+++ b/source/blender/blenkernel/intern/layer.cc
@@ -636,8 +636,6 @@ static bool layer_collection_hidden(ViewLayer *view_layer, LayerCollection *lc)
}
return false;
-
- return false;
}
LayerCollection *BKE_layer_collection_from_index(ViewLayer *view_layer, const int index)
@@ -1210,6 +1208,7 @@ static void layer_collection_sync(ViewLayer *view_layer,
layer_resync->layer->layer_collections = new_lb_layer;
BLI_assert(BLI_listbase_count(&layer_resync->collection->children) - skipped_children ==
BLI_listbase_count(&new_lb_layer));
+ UNUSED_VARS_NDEBUG(skipped_children);
/* Update bases etc. for objects. */
layer_collection_objects_sync(view_layer,
diff --git a/source/blender/blenkernel/intern/paint.cc b/source/blender/blenkernel/intern/paint.cc
index 090a3ce0d7e..1d416eec1e8 100644
--- a/source/blender/blenkernel/intern/paint.cc
+++ b/source/blender/blenkernel/intern/paint.cc
@@ -2629,8 +2629,6 @@ bool BKE_sculpt_attribute_exists(Object *ob,
CustomData *cdata = sculpt_get_cdata(ob, domain);
return CustomData_get_named_layer_index(cdata, proptype, name) != -1;
-
- return false;
}
static SculptAttribute *sculpt_alloc_attr(SculptSession *ss)
diff --git a/source/blender/blenlib/intern/scanfill_utils.c b/source/blender/blenlib/intern/scanfill_utils.c
index 6bf3c4719f6..28b89a79fb0 100644
--- a/source/blender/blenlib/intern/scanfill_utils.c
+++ b/source/blender/blenlib/intern/scanfill_utils.c
@@ -361,7 +361,6 @@ bool BLI_scanfill_calc_self_isect(ScanFillContext *sf_ctx,
{
const uint poly_num = (uint)sf_ctx->poly_nr + 1;
uint eed_index = 0;
- int totvert_new = 0;
bool changed = false;
PolyInfo *poly_info;
@@ -453,7 +452,6 @@ bool BLI_scanfill_calc_self_isect(ScanFillContext *sf_ctx,
if (eve->user_flag != 1) {
BLI_remlink(&sf_ctx->fillvertbase, eve);
BLI_addtail(remvertbase, eve);
- totvert_new--;
}
else {
eve->user_flag = 0;
diff --git a/source/blender/blenlib/tests/BLI_task_test.cc b/source/blender/blenlib/tests/BLI_task_test.cc
index 63bb767466f..b7ee6962aec 100644
--- a/source/blender/blenlib/tests/BLI_task_test.cc
+++ b/source/blender/blenlib/tests/BLI_task_test.cc
@@ -196,11 +196,9 @@ TEST(task, MempoolIterTLS)
int i;
/* Add numbers negative `1..ITEMS_NUM` inclusive. */
- int items_num = 0;
for (i = 0; i < ITEMS_NUM; i++) {
data[i] = (int *)BLI_mempool_alloc(mempool);
*data[i] = -(i + 1);
- items_num++;
}
TaskParallelSettings settings;
diff --git a/source/blender/bmesh/intern/bmesh_interp.c b/source/blender/bmesh/intern/bmesh_interp.c
index f666c9f940d..f96fc734fbc 100644
--- a/source/blender/bmesh/intern/bmesh_interp.c
+++ b/source/blender/bmesh/intern/bmesh_interp.c
@@ -149,14 +149,12 @@ void BM_face_interp_from_face_ex(BMesh *bm,
float *w = BLI_array_alloca(w, f_src->len);
float co[2];
- int i;
if (f_src != f_dst) {
BM_elem_attrs_copy(bm, bm, f_src, f_dst);
}
/* interpolate */
- i = 0;
l_iter = l_first = BM_FACE_FIRST_LOOP(f_dst);
do {
mul_v2_m3v3(co, axis_mat, l_iter->v->co);
@@ -165,7 +163,7 @@ void BM_face_interp_from_face_ex(BMesh *bm,
if (do_vertex) {
CustomData_bmesh_interp(&bm->vdata, blocks_v, w, NULL, f_src->len, l_iter->v->head.data);
}
- } while ((void)i++, (l_iter = l_iter->next) != l_first);
+ } while ((l_iter = l_iter->next) != l_first);
}
void BM_face_interp_from_face(BMesh *bm, BMFace *f_dst, const BMFace *f_src, const bool do_vertex)
diff --git a/source/blender/bmesh/tools/bmesh_intersect.c b/source/blender/bmesh/tools/bmesh_intersect.c
index a6dd914a016..e15122a11e3 100644
--- a/source/blender/bmesh/tools/bmesh_intersect.c
+++ b/source/blender/bmesh/tools/bmesh_intersect.c
@@ -1342,10 +1342,9 @@ bool BM_mesh_intersect(BMesh *bm,
GHASH_ITER (gh_iter, s.face_edges) {
struct LinkBase *e_ls_base = BLI_ghashIterator_getValue(&gh_iter);
LinkNode **node_prev_p;
- uint i;
node_prev_p = &e_ls_base->list;
- for (i = 0, node = e_ls_base->list; node; i++, node = node->next) {
+ for (node = e_ls_base->list; node; node = node->next) {
BMEdge *e = node->link;
if (BM_elem_flag_test(e, BM_ELEM_TAG)) {
/* allocated by arena, don't free */
diff --git a/source/blender/draw/engines/compositor/compositor_engine.cc b/source/blender/draw/engines/compositor/compositor_engine.cc
index 6c2b0e2f3ff..64d483768c2 100644
--- a/source/blender/draw/engines/compositor/compositor_engine.cc
+++ b/source/blender/draw/engines/compositor/compositor_engine.cc
@@ -29,6 +29,8 @@
#include "GPU_texture.h"
+#include "compositor_engine.h" /* Own include. */
+
namespace blender::draw::compositor {
class TexturePool : public realtime_compositor::TexturePool {
diff --git a/source/blender/draw/engines/workbench/workbench_shader.cc b/source/blender/draw/engines/workbench/workbench_shader.cc
index acfe5adf728..021c7df9d58 100644
--- a/source/blender/draw/engines/workbench/workbench_shader.cc
+++ b/source/blender/draw/engines/workbench/workbench_shader.cc
@@ -67,7 +67,6 @@ static const char *workbench_lighting_mode_to_str(int light)
return "_matcap";
case V3D_LIGHTING_FLAT:
return "_flat";
- return "";
}
}
diff --git a/source/blender/editors/animation/fmodifier_ui.c b/source/blender/editors/animation/fmodifier_ui.c
index d2f0ee622c4..4a562f2b420 100644
--- a/source/blender/editors/animation/fmodifier_ui.c
+++ b/source/blender/editors/animation/fmodifier_ui.c
@@ -887,8 +887,7 @@ void ANIM_fmodifier_panels(const bContext *C,
if (!panels_match) {
UI_panels_free_instanced(C, region);
- FModifier *fcm = fmodifiers->first;
- for (int i = 0; fcm; i++, fcm = fcm->next) {
+ for (FModifier *fcm = fmodifiers->first; fcm; fcm = fcm->next) {
char panel_idname[MAX_NAME];
panel_id_fn(fcm, panel_idname);
diff --git a/source/blender/editors/interface/interface_layout.cc b/source/blender/editors/interface/interface_layout.cc
index f4b96899545..04546639039 100644
--- a/source/blender/editors/interface/interface_layout.cc
+++ b/source/blender/editors/interface/interface_layout.cc
@@ -4197,11 +4197,9 @@ static void ui_litem_layout_column_flow(uiLayout *litem)
/* compute max needed width and total height */
int toth = 0;
- int totitem = 0;
LISTBASE_FOREACH (uiItem *, item, &litem->items) {
ui_item_size(item, &itemw, &itemh);
toth += itemh;
- totitem++;
}
/* compute sizes */
diff --git a/source/blender/editors/interface/interface_templates.cc b/source/blender/editors/interface/interface_templates.cc
index 91c8911b97d..79ff2a32503 100644
--- a/source/blender/editors/interface/interface_templates.cc
+++ b/source/blender/editors/interface/interface_templates.cc
@@ -2291,8 +2291,7 @@ void uiTemplateModifiers(uiLayout * /*layout*/, bContext *C)
if (!panels_match) {
UI_panels_free_instanced(C, region);
- ModifierData *md = static_cast<ModifierData *>(modifiers->first);
- for (int i = 0; md; i++, md = md->next) {
+ for (ModifierData *md = static_cast<ModifierData *>(modifiers->first); md; md = md->next) {
const ModifierTypeInfo *mti = BKE_modifier_get_info(ModifierType(md->type));
if (mti->panelRegister == nullptr) {
continue;
@@ -2451,9 +2450,10 @@ void uiTemplateConstraints(uiLayout * /*layout*/, bContext *C, bool use_bone_con
if (!panels_match) {
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list