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 | |
parent | 05725e7b6ef4ee65ff7d9886b32a60c3e620d1c9 (diff) |
code cleanup: white space, spelling & ';;' end of lines.
Diffstat (limited to 'source/blender')
19 files changed, 41 insertions, 40 deletions
diff --git a/source/blender/blenkernel/intern/cdderivedmesh.c b/source/blender/blenkernel/intern/cdderivedmesh.c index c1d6165d37e..b61074d9a94 100644 --- a/source/blender/blenkernel/intern/cdderivedmesh.c +++ b/source/blender/blenkernel/intern/cdderivedmesh.c @@ -2081,7 +2081,7 @@ static DerivedMesh *cddm_copy_ex(DerivedMesh *source, int faces_from_tessfaces) if (!faces_from_tessfaces) DM_DupPolys(source, dm); - else + else CDDM_tessfaces_to_faces(dm); cddm->mloop = CustomData_get_layer(&dm->loopData, CD_MLOOP); diff --git a/source/blender/blenkernel/intern/idprop.c b/source/blender/blenkernel/intern/idprop.c index d9fe0138784..3bcb262fac8 100644 --- a/source/blender/blenkernel/intern/idprop.c +++ b/source/blender/blenkernel/intern/idprop.c @@ -146,7 +146,7 @@ void IDP_ResizeIDPArray(IDProperty *prop, int newlen) return; } - /* - Note: This code comes from python, here's the corrusponding comment. - */ + /* - Note: This code comes from python, here's the corresponding comment. - */ /* This over-allocates proportional to the list size, making room * for additional growth. The over-allocation is mild, but is * enough to give linear-time amortized behavior over a long @@ -220,7 +220,7 @@ void IDP_ResizeArray(IDProperty *prop, int newlen) return; } - /* - Note: This code comes from python, here's the corrusponding comment. - */ + /* - Note: This code comes from python, here's the corresponding comment. - */ /* This over-allocates proportional to the list size, making room * for additional growth. The over-allocation is mild, but is * enough to give linear-time amortized behavior over a long diff --git a/source/blender/blenkernel/intern/mesh.c b/source/blender/blenkernel/intern/mesh.c index 03d4ca0a922..ab9f9aa580e 100644 --- a/source/blender/blenkernel/intern/mesh.c +++ b/source/blender/blenkernel/intern/mesh.c @@ -1706,8 +1706,9 @@ void mesh_calc_normals_mapping_ex(MVert *mverts, int numVerts, for (i=0; i<numFaces; i++, mf++, origIndexFace++) { if (*origIndexFace < numPolys) { copy_v3_v3(fnors[i], pnors[*origIndexFace]); - } else { - /*eek, we're not corrusponding to polys*/ + } + else { + /* eek, we're not corresponding to polys */ printf("error in mesh_calc_normals; tesselation face indices are incorrect. normals may look bad.\n"); } } diff --git a/source/blender/blenkernel/intern/movieclip.c b/source/blender/blenkernel/intern/movieclip.c index 69b32ce46f8..4d8f76467b1 100644 --- a/source/blender/blenkernel/intern/movieclip.c +++ b/source/blender/blenkernel/intern/movieclip.c @@ -957,7 +957,7 @@ void BKE_movieclip_update_scopes(MovieClip *clip, MovieClipUser *user, MovieClip if(user->render_flag&MCLIP_PROXY_RENDER_UNDISTORT) { int width, height; - float aspy= 1.0f/clip->tracking.camera.pixel_aspect;; + float aspy= 1.0f/clip->tracking.camera.pixel_aspect; BKE_movieclip_get_size(clip, user, &width, &height); diff --git a/source/blender/bmesh/bmesh_operator_api.h b/source/blender/bmesh/bmesh_operator_api.h index 79c89392015..b9c9bd52966 100644 --- a/source/blender/bmesh/bmesh_operator_api.h +++ b/source/blender/bmesh/bmesh_operator_api.h @@ -225,7 +225,7 @@ int BMO_mesh_flag_count(struct BMesh *bm, const short oflag, const char htype); * %e - pass in a single element. * %v - pointer to a float vector of length 3. * %m[3/4] - matrix, 3/4 refers to the matrix size, 3 or 4. the - * corrusponding argument must be a pointer to + * corresponding argument must be a pointer to * a float matrix. * %s - copy a slot from another op, instead of mapping to one * argument, it maps to two, a pointer to an operator and diff --git a/source/blender/bmesh/operators/bmo_join_triangles.c b/source/blender/bmesh/operators/bmo_join_triangles.c index 3f102661d30..5ece4b60c4e 100644 --- a/source/blender/bmesh/operators/bmo_join_triangles.c +++ b/source/blender/bmesh/operators/bmo_join_triangles.c @@ -125,7 +125,7 @@ static int compareFaceAttribs(BMesh *bm, BMEdge *e, int douvs, int dovcols) l1 = e->l; l3 = e->l->radial_next; - /* match up loops on each side of an edge corrusponding to each ver */ + /* match up loops on each side of an edge corresponding to each ver */ if (l1->v == l3->v) { l2 = l1->next; l4 = l2->next; diff --git a/source/blender/bmesh/operators/bmo_mesh_conv.c b/source/blender/bmesh/operators/bmo_mesh_conv.c index ce46ae7493d..2f47104476b 100644 --- a/source/blender/bmesh/operators/bmo_mesh_conv.c +++ b/source/blender/bmesh/operators/bmo_mesh_conv.c @@ -687,7 +687,7 @@ void bmesh_to_mesh_exec(BMesh *bm, BMOperator *op) float (*ofs)[3] = NULL; /* go through and find any shapekey customdata layers - * that might not have corrusponding KeyBlocks, and add them if + * that might not have corresponding KeyBlocks, and add them if * necassary */ j = 0; for (i = 0; i < bm->vdata.totlayer; i++) { 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)); diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h index 7d3662c7ffb..83307cc2fc6 100644 --- a/source/blender/makesdna/DNA_object_types.h +++ b/source/blender/makesdna/DNA_object_types.h @@ -136,7 +136,7 @@ typedef struct Object { /* materials */ struct Material **mat; /* material slots */ - char *matbits; /* a boolean field, with each byte 1 if corrusponding material is linked to object */ + char *matbits; /* a boolean field, with each byte 1 if corresponding material is linked to object */ int totcol; /* copy of mesh or curve or meta */ int actcol; /* currently selected material in the UI */ diff --git a/source/blender/python/mathutils/mathutils_noise.c b/source/blender/python/mathutils/mathutils_noise.c index fc9ea877da6..47e93492e7a 100644 --- a/source/blender/python/mathutils/mathutils_noise.c +++ b/source/blender/python/mathutils/mathutils_noise.c @@ -796,7 +796,7 @@ static PyObject *M_Noise_cell_vector(PyObject *UNUSED(self), PyObject *args) return NULL; cellNoiseV(vec[0], vec[1], vec[2], r_vec); - return Vector_CreatePyObject(NULL, 3, Py_NEW, NULL);; + return Vector_CreatePyObject(NULL, 3, Py_NEW, NULL); } static PyMethodDef M_Noise_methods[] = { |