code cleanup:
[blender.git] / source / blender / editors / uvedit / uvedit_unwrap_ops.c
index e504e37cb20460b8920e160ed31131578cb9935d..c8dbee65f6af6c3260bc1db77a28ca8d88330bb9 100644 (file)
@@ -216,8 +216,8 @@ static ParamHandle *construct_param_handle(Scene *scene, BMEditMesh *em,
        BLI_srand(0);
        
        BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) {
-               ScanFillVert *v, *lastv, *firstv;
-               ScanFillFace *sefa;
+               ScanFillVert *sf_vert, *sf_vert_last, *sf_vert_first;
+               ScanFillFace *sf_tri;
                ParamKey key, vkeys[4];
                ParamBool pin[4], select[4];
                BMLoop *ls[3];
@@ -264,35 +264,35 @@ static ParamHandle *construct_param_handle(Scene *scene, BMEditMesh *em,
                        /* ngon - scanfill time! */
                        BLI_scanfill_begin(&sf_ctx);
                        
-                       firstv = lastv = NULL;
+                       sf_vert_first = sf_vert_last = NULL;
                        BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) {
                                int i;
                                
-                               v = BLI_scanfill_vert_add(&sf_ctx, l->v->co);
+                               sf_vert = BLI_scanfill_vert_add(&sf_ctx, l->v->co);
                                
                                /* add small random offset */
                                for (i = 0; i < 3; i++) {
-                                       v->co[i] += (BLI_frand() - 0.5f) * FLT_EPSILON * 50;
+                                       sf_vert->co[i] += (BLI_frand() - 0.5f) * FLT_EPSILON * 50;
                                }
                                
-                               v->tmp.p = l;
+                               sf_vert->tmp.p = l;
 
-                               if (lastv) {
-                                       BLI_scanfill_edge_add(&sf_ctx, lastv, v);
+                               if (sf_vert_last) {
+                                       BLI_scanfill_edge_add(&sf_ctx, sf_vert_last, sf_vert);
                                }
 
-                               lastv = v;
-                               if (!firstv) 
-                                       firstv = v;
+                               sf_vert_last = sf_vert;
+                               if (!sf_vert_first)
+                                       sf_vert_first = sf_vert;
                        }
 
-                       BLI_scanfill_edge_add(&sf_ctx, firstv, v);
+                       BLI_scanfill_edge_add(&sf_ctx, sf_vert_first, sf_vert);
 
                        BLI_scanfill_calc_ex(&sf_ctx, TRUE, efa->no);
-                       for (sefa = sf_ctx.fillfacebase.first; sefa; sefa = sefa->next) {
-                               ls[0] = sefa->v1->tmp.p;
-                               ls[1] = sefa->v2->tmp.p;
-                               ls[2] = sefa->v3->tmp.p;
+                       for (sf_tri = sf_ctx.fillfacebase.first; sf_tri; sf_tri = sf_tri->next) {
+                               ls[0] = sf_tri->v1->tmp.p;
+                               ls[1] = sf_tri->v2->tmp.p;
+                               ls[2] = sf_tri->v3->tmp.p;
 
                                for (i = 0; i < 3; i++) {
                                        MLoopUV *luv = CustomData_bmesh_get(&em->bm->ldata, ls[i]->head.data, CD_MLOOPUV);