griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

code cleanup: fix possible use of uninitialized value and remove dead initializations.

Browse Source
This commit is contained in:
Campbell Barton
2012-05-23 21:39:39 +00:00
parent 5d82173a78
commit 5b8cbbe3fd
3 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
source/blender/blenkernel/intern/cdderivedmesh.c
View File

@@ -1471,9 +1471,9 @@ static void cdDM_foreachMappedFaceCenter(
void *userData)
{
CDDerivedMesh *cddm = (CDDerivedMesh *)dm;
MVert *mv = cddm->mvert;
MPoly *mp = cddm->mpoly;
MLoop *ml = cddm->mloop;
MVert *mvert = cddm->mvert;
MPoly *mp;
MLoop *ml;
int i, j, orig, *index;
index = CustomData_get_layer(&dm->polyData, CD_ORIGINDEX);
@@ -1492,23 +1492,23 @@ static void cdDM_foreachMappedFaceCenter(
ml = &cddm->mloop[mp->loopstart];
cent[0] = cent[1] = cent[2] = 0.0f;
for (j = 0; j < mp->totloop; j++, ml++) {
add_v3_v3v3(cent, cent, mv[ml->v].co);
add_v3_v3v3(cent, cent, mvert[ml->v].co);
}
mul_v3_fl(cent, 1.0f / (float)j);
ml = &cddm->mloop[mp->loopstart];
if (j > 3) {
normal_quad_v3(no,
mv[(ml + 0)->v].co,
mv[(ml + 1)->v].co,
mv[(ml + 2)->v].co,
mv[(ml + 3)->v].co);
mvert[(ml + 0)->v].co,
mvert[(ml + 1)->v].co,
mvert[(ml + 2)->v].co,
mvert[(ml + 3)->v].co);
}
else {
normal_tri_v3(no,
mv[(ml + 0)->v].co,
mv[(ml + 1)->v].co,
mv[(ml + 2)->v].co);
mvert[(ml + 0)->v].co,
mvert[(ml + 1)->v].co,
mvert[(ml + 2)->v].co);
}
func(userData, orig, cent, no);

1
source/blender/bmesh/operators/bmo_slide.c
View File

@@ -88,6 +88,7 @@ void bmo_vertex_slide_exec(BMesh *bm, BMOperator *op)
}
/* Make sure we get the correct edge. */
slide_edge = NULL;
BM_ITER_ELEM (edge, &iter, vertex, BM_EDGES_OF_VERT) {
if (BMO_elem_flag_test(bm, edge, EDGE_MARK) && BM_vert_in_edge(edge, vertex)) {
slide_edge = edge;

10
source/blender/editors/sculpt_paint/paint_vertex.c
View File

@@ -259,8 +259,6 @@ static void do_shared_vertex_tesscol(Mesh *me)
void do_shared_vertexcol(Mesh *me, int do_tessface)
{
const int use_face_sel = (me->editflag & ME_EDIT_PAINT_MASK);
MLoop *ml = me->mloop;
MLoopCol *lcol = me->mloopcol;
MPoly *mp;
float (*scol)[4];
int i, j, has_shared = 0;
@@ -274,8 +272,8 @@ void do_shared_vertexcol(Mesh *me, int do_tessface)
for (i = 0, mp = me->mpoly; i < me->totpoly; i++, mp++) {
if ((use_face_sel == FALSE) || (mp->flag & ME_FACE_SEL)) {
ml = me->mloop + mp->loopstart;
lcol = me->mloopcol + mp->loopstart;
MLoop *ml = me->mloop + mp->loopstart;
MLoopCol *lcol = me->mloopcol + mp->loopstart;
for (j = 0; j < mp->totloop; j++, ml++, lcol++) {
scol[ml->v][0] += lcol->r;
scol[ml->v][1] += lcol->g;
@@ -295,8 +293,8 @@ void do_shared_vertexcol(Mesh *me, int do_tessface)
for (i = 0, mp = me->mpoly; i < me->totpoly; i++, mp++) {
if ((use_face_sel == FALSE) || (mp->flag & ME_FACE_SEL)) {
ml = me->mloop + mp->loopstart;
lcol = me->mloopcol + mp->loopstart;
MLoop *ml = me->mloop + mp->loopstart;
MLoopCol *lcol = me->mloopcol + mp->loopstart;
for (j = 0; j < mp->totloop; j++, ml++, lcol++) {
lcol->r = scol[ml->v][0];
lcol->g = scol[ml->v][1];