Commit: ab382230471c6ee94e82d0fac3f5093e30710628 Author: Campbell Barton Date: Sun Jun 13 14:47:22 2021 +1000 Branches: master https://developer.blender.org/rBab382230471c6ee94e82d0fac3f5093e30710628
Cleanup: redundant initialization These were limited to obvious cases. Some less obvious cases were kept as refactoring might make them necessary in future. =================================================================== M source/blender/blenkernel/intern/mesh.c M source/blender/blenkernel/intern/mesh_evaluate.c M source/blender/blenkernel/intern/subsurf_ccg.c M source/blender/blenlib/intern/mesh_boolean.cc M source/blender/blenloader/intern/versioning_280.c M source/blender/bmesh/tools/bmesh_bevel.c M source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc M source/blender/draw/engines/overlay/overlay_armature.c M source/blender/editors/curve/editcurve.c M source/blender/editors/curve/editcurve_paint.c M source/blender/editors/gpencil/gpencil_trace_utils.c M source/blender/editors/mesh/meshtools.c M source/blender/editors/sculpt_paint/sculpt_undo.c M source/blender/editors/space_clip/clip_ops.c M source/blender/editors/space_graph/graph_select.c M source/blender/editors/space_image/image_ops.c M source/blender/editors/space_info/info_draw.c M source/blender/editors/transform/transform_mode_maskshrinkfatten.c M source/blender/editors/transform/transform_snap.c M source/blender/gpencil_modifiers/intern/lineart/lineart_chain.c M source/blender/gpu/intern/gpu_shader.cc M source/blender/makesdna/intern/dna_genfile.c M source/blender/makesrna/intern/rna_scene.c M source/blender/makesrna/intern/rna_userdef.c M source/blender/sequencer/intern/strip_add.c M source/blender/windowmanager/intern/wm_files.c =================================================================== diff --git a/source/blender/blenkernel/intern/mesh.c b/source/blender/blenkernel/intern/mesh.c index ddbc7e7d1ef..0b843c3a97a 100644 --- a/source/blender/blenkernel/intern/mesh.c +++ b/source/blender/blenkernel/intern/mesh.c @@ -1521,12 +1521,12 @@ void BKE_mesh_transform(Mesh *me, const float mat[4][4], bool do_keys) void BKE_mesh_translate(Mesh *me, const float offset[3], const bool do_keys) { - MVert *mvert = CustomData_duplicate_referenced_layer(&me->vdata, CD_MVERT, me->totvert); + CustomData_duplicate_referenced_layer(&me->vdata, CD_MVERT, me->totvert); /* If the referenced layer has been re-allocated need to update pointers stored in the mesh. */ BKE_mesh_update_customdata_pointers(me, false); int i = me->totvert; - for (mvert = me->mvert; i--; mvert++) { + for (MVert *mvert = me->mvert; i--; mvert++) { add_v3_v3(mvert->co, offset); } diff --git a/source/blender/blenkernel/intern/mesh_evaluate.c b/source/blender/blenkernel/intern/mesh_evaluate.c index 345546bc9cf..826094420a7 100644 --- a/source/blender/blenkernel/intern/mesh_evaluate.c +++ b/source/blender/blenkernel/intern/mesh_evaluate.c @@ -2567,7 +2567,7 @@ bool BKE_mesh_center_median_from_polys(const Mesh *me, float r_cent[3]) const MLoop *mloop = me->mloop; const MVert *mvert = me->mvert; zero_v3(r_cent); - for (mpoly = me->mpoly; i--; mpoly++) { + for (; i--; mpoly++) { int loopend = mpoly->loopstart + mpoly->totloop; for (int j = mpoly->loopstart; j < loopend; j++) { add_v3_v3(r_cent, mvert[mloop[j].v].co); diff --git a/source/blender/blenkernel/intern/subsurf_ccg.c b/source/blender/blenkernel/intern/subsurf_ccg.c index a28136f8527..23eccbfba9b 100644 --- a/source/blender/blenkernel/intern/subsurf_ccg.c +++ b/source/blender/blenkernel/intern/subsurf_ccg.c @@ -1879,12 +1879,11 @@ static const MeshElemMap *ccgDM_getPolyMap(Object *ob, DerivedMesh *dm) /* WARNING! *MUST* be called in an 'loops_cache_rwlock' protected thread context! */ static void ccgDM_recalcLoopTri(DerivedMesh *dm) { - MLoopTri *mlooptri = dm->looptris.array; const int tottri = dm->numPolyData * 2; int i, poly_index; DM_ensure_looptri_data(dm); - mlooptri = dm->looptris.array_wip; + MLoopTri *mlooptri = dm->looptris.array_wip; BLI_assert(tottri == 0 || mlooptri != NULL); BLI_assert(poly_to_tri_count(dm->numPolyData, dm->numLoopData) == dm->looptris.num); diff --git a/source/blender/blenlib/intern/mesh_boolean.cc b/source/blender/blenlib/intern/mesh_boolean.cc index 25aeae519c1..c5c830bb4dd 100644 --- a/source/blender/blenlib/intern/mesh_boolean.cc +++ b/source/blender/blenlib/intern/mesh_boolean.cc @@ -1406,9 +1406,9 @@ static int find_cell_for_point_near_edge(mpq3 p, int dummy_index = p_sorted_dummy - sorted_tris.begin(); int prev_tri = (dummy_index == 0) ? sorted_tris[sorted_tris.size() - 1] : sorted_tris[dummy_index - 1]; - int next_tri = (dummy_index == sorted_tris.size() - 1) ? sorted_tris[0] : - sorted_tris[dummy_index + 1]; if (dbg_level > 0) { + int next_tri = (dummy_index == sorted_tris.size() - 1) ? sorted_tris[0] : + sorted_tris[dummy_index + 1]; std::cout << "prev tri to dummy = " << prev_tri << "; next tri to dummy = " << next_tri << "\n"; } diff --git a/source/blender/blenloader/intern/versioning_280.c b/source/blender/blenloader/intern/versioning_280.c index cf082393803..cf8f45ca227 100644 --- a/source/blender/blenloader/intern/versioning_280.c +++ b/source/blender/blenloader/intern/versioning_280.c @@ -3172,7 +3172,7 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain) bool is_blend = false; { - char tool = tool_init; + char tool; switch (tool_init) { case PAINT_BLEND_MIX: tool = VPAINT_TOOL_DRAW; diff --git a/source/blender/bmesh/tools/bmesh_bevel.c b/source/blender/bmesh/tools/bmesh_bevel.c index cef97f20a6a..d39fb5e81f1 100644 --- a/source/blender/bmesh/tools/bmesh_bevel.c +++ b/source/blender/bmesh/tools/bmesh_bevel.c @@ -7361,7 +7361,6 @@ static float geometry_collide_offset(BevelParams *bp, EdgeHalf *eb) static float vertex_collide_offset(BevelParams *bp, EdgeHalf *ea) { float no_collide_offset = bp->offset + 1e6; - float limit = no_collide_offset; if (bp->offset == 0.0f) { return no_collide_offset; } @@ -7373,8 +7372,7 @@ static float vertex_collide_offset(BevelParams *bp, EdgeHalf *ea) if (kab <= 0.0f) { return no_collide_offset; } - limit = la / kab; - return limit; + return la / kab; } /** diff --git a/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc b/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc index e5d7bd70214..0d367762b00 100644 --- a/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc +++ b/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc @@ -320,7 +320,6 @@ bool id_copy_inplace_no_main(const ID *id, ID *newid) * is already allocated. */ bool scene_copy_inplace_no_main(const Scene *scene, Scene *new_scene) { - const ID *id_for_copy = &scene->id; if (G.debug & G_DEBUG_DEPSGRAPH_UUID) { SEQ_relations_check_uuids_unique_and_report(scene); @@ -328,9 +327,10 @@ bool scene_copy_inplace_no_main(const Scene *scene, Scene *new_scene) #ifdef NESTED_ID_NASTY_WORKAROUND NestedIDHackTempStorage id_hack_storage; - id_for_copy = nested_id_hack_get_discarded_pointers(&id_hack_storage, &scene->id); + const ID *id_for_copy = nested_id_hack_get_discarded_pointers(&id_hack_storage, &scene->id); +#else + const ID *id_for_copy = &scene->id; #endif - bool result = (BKE_id_copy_ex(nullptr, id_for_copy, (ID **)&new_scene, diff --git a/source/blender/draw/engines/overlay/overlay_armature.c b/source/blender/draw/engines/overlay/overlay_armature.c index fbad60ff4ab..2f9ececc198 100644 --- a/source/blender/draw/engines/overlay/overlay_armature.c +++ b/source/blender/draw/engines/overlay/overlay_armature.c @@ -2063,9 +2063,8 @@ static void draw_armature_pose(ArmatureDrawContext *ctx) set_pchan_colorset(ctx, ob, pchan); } - int boneflag = bone->flag; /* catch exception for bone with hidden parent */ - boneflag = bone->flag; + int boneflag = bone->flag; if ((bone->parent) && (bone->parent->flag & (BONE_HIDDEN_P | BONE_HIDDEN_PG))) { boneflag &= ~BONE_CONNECTED; } diff --git a/source/blender/editors/curve/editcurve.c b/source/blender/editors/curve/editcurve.c index 535ccaa06fd..2999ac784ba 100644 --- a/source/blender/editors/curve/editcurve.c +++ b/source/blender/editors/curve/editcurve.c @@ -6646,7 +6646,7 @@ void CURVE_OT_dissolve_verts(wmOperatorType *ot) static bool nurb_bezt_flag_any(const Nurb *nu, const char flag_test) { - BezTriple *bezt = nu->bezt; + const BezTriple *bezt; int i; for (i = nu->pntsu, bezt = nu->bezt; i--; bezt++) { diff --git a/source/blender/editors/curve/editcurve_paint.c b/source/blender/editors/curve/editcurve_paint.c index e4f2de1f741..03c120df28b 100644 --- a/source/blender/editors/curve/editcurve_paint.c +++ b/source/blender/editors/curve/editcurve_paint.c @@ -387,7 +387,6 @@ static void curve_draw_stroke_3d(const struct bContext *UNUSED(C), GPU_matrix_translate_3f(selem->location_local[0] - location_prev[0], selem->location_local[1] - location_prev[1], selem->location_local[2] - location_prev[2]); - location_prev = selem->location_local; const float radius = stroke_elem_radius(cdd, selem); diff --git a/source/blender/editors/gpencil/gpencil_trace_utils.c b/source/blender/editors/gpencil/gpencil_trace_utils.c index 482f7015720..12c38fb2744 100644 --- a/source/blender/editors/gpencil/gpencil_trace_utils.c +++ b/source/blender/editors/gpencil/gpencil_trace_utils.c @@ -281,7 +281,6 @@ void ED_gpencil_trace_data_to_strokes(Main *bmain, mat_mask_idx = ob->totcol - 1; } - potrace_path_t *path = st->plist; int n, *tag; potrace_dpoint_t(*c)[3]; @@ -289,7 +288,7 @@ void ED_gpencil_trace_data_to_strokes(Main *bmain, * good results using the Potrace data. */ const float scalef = 0.008f * scale; /* Draw each curve. */ - path = st->plist; + potrace_path_t *path = st->plist; while (path != NULL) { n = path->curve.n; tag = path->curve.tag; diff --git a/source/blender/editors/mesh/meshtools.c b/source/blender/editors/mesh/meshtools.c index 3450d61337c..f306612f295 100644 --- a/source/blender/editors/mesh/meshtools.c +++ b/source/blender/editors/mesh/meshtools.c @@ -149,7 +149,7 @@ static void join_mesh_single(Depsgraph *depsgraph, mul_m4_m4m4(cmat, imat, ob_src->obmat); /* transform vertex coordinates into new space */ - for (a = 0, mvert = *mvert_pp; a < me->totvert; a++, mvert++) { + for (a = 0; a < me->totvert; a++, mvert++) { mul_m4_v3(cmat, mvert->co); } diff --git a/source/blender/editors/sculpt_paint/sculpt_undo.c b/source/blender/editors/sculpt_paint/sculpt_undo.c index b6205db6f45..71166b7c20c 100644 --- a/source/blender/editors/sculpt_paint/sculpt_undo.c +++ b/source/blender/editors/sculpt_paint/sculpt_undo.c @@ -1189,9 +1189,7 @@ static SculptUndoNode *sculpt_undo_geometry_push(Object *object, SculptUndoType static SculptUndoNode *sculpt_undo_face_sets_push(Object *ob, SculptUndoType type) { UndoSculpt *usculpt = sculpt_undo_get_nodes(); - SculptUndoNode *unode = usculpt->nodes.first; - - unode = MEM_callocN(sizeof(*unode), __func__); + SculptUndoNode *unode = MEM_callocN(sizeof(*unode), __func__); BLI_strncpy(unode->idname, ob->id.name, sizeof(unode->idname)); unode->type = type; diff --git a/source/blender/editors/space_clip/clip_ops.c b/source/blender/editors/space_clip/clip_ops.c index cd60ebf3031..369a6e7c944 100644 --- a/source/blender/editors/space_clip/clip_ops.c +++ b/source/blender/editors/space_clip/clip_ops.c @@ -1235,10 +1235,8 @@ @@ Diff output truncated at 10240 characters. @@ _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs