archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Correct some errors in auto-cleanup

Browse Source
This commit is contained in:
Campbell Barton
2014-04-27 22:02:25 +10:00
parent c26105278f
commit d7d2e71a03
7 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
source/blender/blenkernel/intern/mesh_evaluate.c
View File

@@ -172,8 +172,8 @@ static void mesh_calc_normals_poly_accum(MPoly *mp, MLoop *ml,
/* inline version of #BKE_mesh_calc_poly_normal, also does edge-vectors */
{
int i_prev = nverts - 1;
const float const *v_prev = mvert[ml[i_prev].v].co;
const float const *v_curr;
const float *v_prev = mvert[ml[i_prev].v].co;
const float *v_curr;
zero_v3(polyno);
/* Newell's Method */
@@ -738,8 +738,8 @@ static void mesh_calc_ngon_normal(MPoly *mpoly, MLoop *loopstart,
MVert *mvert, float normal[3])
{
const int nverts = mpoly->totloop;
const float const *v_prev = mvert[loopstart[nverts - 1].v].co;
const float const *v_curr;
const float *v_prev = mvert[loopstart[nverts - 1].v].co;
const float *v_curr;
int i;
zero_v3(normal);
@@ -788,8 +788,8 @@ static void mesh_calc_ngon_normal_coords(MPoly *mpoly, MLoop *loopstart,
const float (*vertex_coords)[3], float normal[3])
{
const int nverts = mpoly->totloop;
const float const *v_prev = vertex_coords[loopstart[nverts - 1].v];
const float const *v_curr;
const float *v_prev = vertex_coords[loopstart[nverts - 1].v];
const float *v_curr;
int i;
zero_v3(normal);

4
source/blender/blenlib/intern/math_geom.c
View File

@@ -95,8 +95,8 @@ float normal_quad_v3(float n[3], const float v1[3], const float v2[3], const flo
*/
float normal_poly_v3(float n[3], const float verts[][3], unsigned int nr)
{
const float const *v_prev = verts[nr - 1];
const float const *v_curr = verts[0];
const float *v_prev = verts[nr - 1];
const float *v_curr = verts[0];
unsigned int i;
zero_v3(n);

14
source/blender/bmesh/intern/bmesh_edgeloop.c
View File

@@ -544,9 +544,9 @@ void BM_edgeloop_calc_center(BMesh *UNUSED(bm), BMEdgeLoopStore *el_store)
LinkData *node_first = el_store->verts.first;
LinkData *node_next = node_first;
const float const *v_prev = NODE_AS_CO(node_prev);
const float const *v_curr = NODE_AS_CO(node_curr);
const float const *v_next = NODE_AS_CO(node_next);
const float *v_prev = NODE_AS_CO(node_prev);
const float *v_curr = NODE_AS_CO(node_curr);
const float *v_next = NODE_AS_CO(node_next);
float totw = 0.0f;
float w_prev;
@@ -582,8 +582,8 @@ void BM_edgeloop_calc_center(BMesh *UNUSED(bm), BMEdgeLoopStore *el_store)
bool BM_edgeloop_calc_normal(BMesh *UNUSED(bm), BMEdgeLoopStore *el_store)
{
LinkData *node_curr = el_store->verts.first;
const float const *v_prev = NODE_AS_CO(el_store->verts.last);
const float const *v_curr = NODE_AS_CO(node_curr);
const float *v_prev = NODE_AS_CO(el_store->verts.last);
const float *v_curr = NODE_AS_CO(node_curr);
zero_v3(el_store->no);
@@ -619,8 +619,8 @@ bool BM_edgeloop_calc_normal(BMesh *UNUSED(bm), BMEdgeLoopStore *el_store)
bool BM_edgeloop_calc_normal_aligned(BMesh *UNUSED(bm), BMEdgeLoopStore *el_store, const float no_align[3])
{
LinkData *node_curr = el_store->verts.first;
const float const *v_prev = NODE_AS_CO(el_store->verts.last);
const float const *v_curr = NODE_AS_CO(node_curr);
const float *v_prev = NODE_AS_CO(el_store->verts.last);
const float *v_curr = NODE_AS_CO(node_curr);
zero_v3(el_store->no);

8
source/blender/bmesh/intern/bmesh_polygon.c
View File

@@ -78,8 +78,8 @@ static void bm_face_calc_poly_normal(const BMFace *f, float n[3])
{
BMLoop *l_first = BM_FACE_FIRST_LOOP(f);
BMLoop *l_iter = l_first;
const float const *v_prev = l_first->prev->v->co;
const float const *v_curr = l_first->v->co;
const float *v_prev = l_first->prev->v->co;
const float *v_curr = l_first->v->co;
zero_v3(n);
@@ -109,8 +109,8 @@ static void bm_face_calc_poly_normal_vertex_cos(BMFace *f, float r_no[3],
{
BMLoop *l_first = BM_FACE_FIRST_LOOP(f);
BMLoop *l_iter = l_first;
const float const *v_prev = vertexCos[BM_elem_index_get(l_first->prev->v)];
const float const *v_curr = vertexCos[BM_elem_index_get(l_first->v)];
const float *v_prev = vertexCos[BM_elem_index_get(l_first->prev->v)];
const float *v_curr = vertexCos[BM_elem_index_get(l_first->v)];
zero_v3(r_no);

2
source/blender/bmesh/operators/bmo_connect_nonplanar.c
View File

@@ -43,7 +43,7 @@
*/
static bool bm_face_subset_calc_normal(BMLoop *l_first, BMLoop *l_last, float r_no[3])
{
const float const *v_prev, *v_curr;
const float *v_prev, *v_curr;
/* Newell's Method */
BMLoop *l_iter = l_first;

2
source/blender/bmesh/tools/bmesh_bevel.c
View File

@@ -1375,7 +1375,7 @@ static void build_boundary(BevelParams *bp, BevVert *bv, bool construct)
BevVert *bvother;
VMesh *vm;
float co[3];
const float *no;
const float *no;
float lastd;
vm = bv->vmesh;

2
source/blender/editors/mesh/editmesh_knife.c
View File

@@ -2934,7 +2934,7 @@ static void edvm_mesh_knife_face_point(BMFace *f, float r_cent[3])
unsigned int (*index)[3] = BLI_array_alloca(index, tottri);
int j;
const float const *best_co[3] = {NULL};
const float *best_co[3] = {NULL};
float best_area = -1.0f;
bool ok = false;