diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-02-25 20:04:03 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-02-25 20:04:03 +0400 |
commit | 6ca7d8293228e821695a3149e8fb91b0d305daeb (patch) | |
tree | 05443cd06956fd844d73f333aea5d388f5d22efb /source/blender/editors | |
parent | 05725e7b6ef4ee65ff7d9886b32a60c3e620d1c9 (diff) |
code cleanup: white space, spelling & ';;' end of lines.
Diffstat (limited to 'source/blender/editors')
-rw-r--r-- | source/blender/editors/mesh/bmesh_select.c | 4 | ||||
-rw-r--r-- | source/blender/editors/mesh/bmesh_tools.c | 2 | ||||
-rw-r--r-- | source/blender/editors/mesh/editface.c | 2 | ||||
-rwxr-xr-x | source/blender/editors/mesh/knifetool.c | 34 | ||||
-rw-r--r-- | source/blender/editors/mesh/mesh_data.c | 4 | ||||
-rw-r--r-- | source/blender/editors/object/object_edit.c | 2 | ||||
-rw-r--r-- | source/blender/editors/space_clip/tracking_ops.c | 4 | ||||
-rw-r--r-- | source/blender/editors/space_view3d/drawmesh.c | 2 | ||||
-rw-r--r-- | source/blender/editors/uvedit/uvedit_ops.c | 2 | ||||
-rw-r--r-- | source/blender/editors/uvedit/uvedit_smart_stitch.c | 2 |
10 files changed, 29 insertions, 29 deletions
diff --git a/source/blender/editors/mesh/bmesh_select.c b/source/blender/editors/mesh/bmesh_select.c index 73436dbfe14..817c5301780 100644 --- a/source/blender/editors/mesh/bmesh_select.c +++ b/source/blender/editors/mesh/bmesh_select.c @@ -248,7 +248,7 @@ int EDBM_mask_init_backbuf_border(ViewContext *vc, int mcords[][2], short tot, s /* yah, opengl doesn't do concave... tsk! */ ED_region_pixelspace(vc->ar); - draw_triangulated(mcords, tot); + draw_triangulated(mcords, tot); glBegin(GL_LINE_LOOP); /* for zero sized masks, lines */ for (a = 0; a < tot; a++) { @@ -2720,7 +2720,7 @@ static int loop_to_region(bContext *C, wmOperator *op) int a, b; /* find the set of regions with smallest number of total faces */ - a = loop_find_regions(em, selbigger); + a = loop_find_regions(em, selbigger); b = loop_find_regions(em, !selbigger); if ((a <= b) ^ selbigger) { diff --git a/source/blender/editors/mesh/bmesh_tools.c b/source/blender/editors/mesh/bmesh_tools.c index 972236ab411..ada11483f36 100644 --- a/source/blender/editors/mesh/bmesh_tools.c +++ b/source/blender/editors/mesh/bmesh_tools.c @@ -3102,7 +3102,7 @@ static int knife_cut_exec(bContext *C, wmOperator *op) if (bm->totvertsel < 2) { //error("No edges are selected to operate on"); - return OPERATOR_CANCELLED;; + return OPERATOR_CANCELLED; } /* get the cut curve */ diff --git a/source/blender/editors/mesh/editface.c b/source/blender/editors/mesh/editface.c index 65a34e2d1b3..58b5154cdff 100644 --- a/source/blender/editors/mesh/editface.c +++ b/source/blender/editors/mesh/editface.c @@ -113,7 +113,7 @@ void paintface_flush_flags(Object *ob) if ((index_array = CustomData_get_layer(&dm->faceData, CD_POLYINDEX))) { polys = dm->getPolyArray(dm); - faces = dm->getTessFaceArray(dm);; + faces = dm->getTessFaceArray(dm); totface = dm->getNumTessFaces(dm); /* loop over tessfaces */ diff --git a/source/blender/editors/mesh/knifetool.c b/source/blender/editors/mesh/knifetool.c index 1b8e90ffce7..5e50990b863 100755 --- a/source/blender/editors/mesh/knifetool.c +++ b/source/blender/editors/mesh/knifetool.c @@ -580,29 +580,29 @@ static void knife_cut_through(knifetool_opdata *kcd) if (firstv) { /* For each face incident to firstv, * find the first following linehit (if any) sharing that face and connect */ - for (r = firstfaces.first; r; r = r->next ) { - f = r->ref; - found = 0; - for (j = 0, lh2 = kcd->linehits; j < kcd->totlinehit; j++, lh2++) { - kfe2 = lh2->kfe; - for (r2 = kfe2->faces.first; r2; r2 = r2->next) { - if (r2->ref == f) { - v2 = splitkfe[j] ? kfe2->v1 : knife_split_edge(kcd, kfe2, lh2->hit, &splitkfe[j]); - knife_add_single_cut_through(kcd, firstv, v2, f); - found = 1; - break; - } - } - } - if (!found && lastv) { + for (r = firstfaces.first; r; r = r->next ) { + f = r->ref; + found = 0; + for (j = 0, lh2 = kcd->linehits; j < kcd->totlinehit; j++, lh2++) { + kfe2 = lh2->kfe; + for (r2 = kfe2->faces.first; r2; r2 = r2->next) { + if (r2->ref == f) { + v2 = splitkfe[j] ? kfe2->v1 : knife_split_edge(kcd, kfe2, lh2->hit, &splitkfe[j]); + knife_add_single_cut_through(kcd, firstv, v2, f); + found = 1; + break; + } + } + } + if (!found && lastv) { for (r2 = lastfaces.first; r2; r2 = r2->next) { if (r2->ref == f) { knife_add_single_cut_through(kcd, firstv, lastv, f); break; } } - } - } + } + } } for (i = 0, lh = kcd->linehits; i < kcd->totlinehit; i++, lh++) { diff --git a/source/blender/editors/mesh/mesh_data.c b/source/blender/editors/mesh/mesh_data.c index c35bf8988b7..2be66ca5310 100644 --- a/source/blender/editors/mesh/mesh_data.c +++ b/source/blender/editors/mesh/mesh_data.c @@ -371,10 +371,10 @@ int ED_mesh_uv_texture_remove(bContext *C, Object *ob, Mesh *me) CustomDataLayer *cdlp, *cdlu; int index; - index= CustomData_get_active_layer_index(pdata, CD_MTEXPOLY); + index= CustomData_get_active_layer_index(pdata, CD_MTEXPOLY); cdlp= (index == -1)? NULL: &pdata->layers[index]; - index= CustomData_get_active_layer_index(ldata, CD_MLOOPUV); + index= CustomData_get_active_layer_index(ldata, CD_MLOOPUV); cdlu= (index == -1)? NULL: &ldata->layers[index]; if (!cdlp || !cdlu) diff --git a/source/blender/editors/object/object_edit.c b/source/blender/editors/object/object_edit.c index 6825edb0822..1626a074c42 100644 --- a/source/blender/editors/object/object_edit.c +++ b/source/blender/editors/object/object_edit.c @@ -1748,7 +1748,7 @@ static int game_physics_copy_exec(bContext *C, wmOperator *UNUSED(op)) ob_iter->gameflag = ob->gameflag; ob_iter->gameflag2 = ob->gameflag2; ob_iter->inertia = ob->inertia; - ob_iter->formfactor = ob->formfactor;; + ob_iter->formfactor = ob->formfactor; ob_iter->damping = ob->damping; ob_iter->rdamping = ob->rdamping; ob_iter->min_vel = ob->min_vel; diff --git a/source/blender/editors/space_clip/tracking_ops.c b/source/blender/editors/space_clip/tracking_ops.c index 6a9c2755330..fc48516b378 100644 --- a/source/blender/editors/space_clip/tracking_ops.c +++ b/source/blender/editors/space_clip/tracking_ops.c @@ -1143,8 +1143,8 @@ static int select_groped_exec(bContext *C, wmOperator *op) if(ok) { track->flag|= SELECT; - if(sc->flag&SC_SHOW_MARKER_PATTERN) track->pat_flag|= SELECT;; - if(sc->flag&SC_SHOW_MARKER_SEARCH) track->search_flag|= SELECT;; + if(sc->flag&SC_SHOW_MARKER_PATTERN) track->pat_flag|= SELECT; + if(sc->flag&SC_SHOW_MARKER_SEARCH) track->search_flag|= SELECT; } track= track->next; diff --git a/source/blender/editors/space_view3d/drawmesh.c b/source/blender/editors/space_view3d/drawmesh.c index 513df524872..e368d8c10b7 100644 --- a/source/blender/editors/space_view3d/drawmesh.c +++ b/source/blender/editors/space_view3d/drawmesh.c @@ -698,7 +698,7 @@ static void draw_mesh_text(Scene *scene, Object *ob, int glsl) /* LOCATION */ ddm->getVertCo(ddm, mp_vi[0], v1); ddm->getVertCo(ddm, mp_vi[1], v2); - ddm->getVertCo(ddm, mp_vi[2], v3);; + ddm->getVertCo(ddm, mp_vi[2], v3); if (mp->totloop >= 4) { ddm->getVertCo(ddm, mp_vi[3], v4); } diff --git a/source/blender/editors/uvedit/uvedit_ops.c b/source/blender/editors/uvedit/uvedit_ops.c index 92912018812..2bbbeb0fa31 100644 --- a/source/blender/editors/uvedit/uvedit_ops.c +++ b/source/blender/editors/uvedit/uvedit_ops.c @@ -2017,7 +2017,7 @@ static int mouse_select(bContext *C, float co[2], int extend, int loop) #endif - DAG_id_tag_update(obedit->data, 0); + DAG_id_tag_update(obedit->data, 0); WM_event_add_notifier(C, NC_GEOM|ND_SELECT, obedit->data); BLI_array_free(hitv); diff --git a/source/blender/editors/uvedit/uvedit_smart_stitch.c b/source/blender/editors/uvedit/uvedit_smart_stitch.c index c3c19b683e1..a57be322a92 100644 --- a/source/blender/editors/uvedit/uvedit_smart_stitch.c +++ b/source/blender/editors/uvedit/uvedit_smart_stitch.c @@ -697,7 +697,7 @@ static int stitch_process_data(StitchState *state, Scene *scene, int final) if(i < numoftris){ /* using next since the first uv is already accounted for */ BMLoop *lnext = l->next; - MLoopUV *luvnext = CustomData_bmesh_get(&state->em->bm->ldata, lnext->next->head.data, CD_MLOOPUV);; + MLoopUV *luvnext = CustomData_bmesh_get(&state->em->bm->ldata, lnext->next->head.data, CD_MLOOPUV); luv = CustomData_bmesh_get(&state->em->bm->ldata, lnext->head.data, CD_MLOOPUV); memcpy(preview->static_tris + buffer_index, fuv->uv, 2*sizeof(float)); |