diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-08-04 16:30:16 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-08-04 16:30:16 +0400 |
commit | 9ff4fa667108eeecfaaaae477b9e3708c0db5eab (patch) | |
tree | 025fd5ede7537919d4c70ee2423ebefc2853ae57 /source/blender/editors | |
parent | 2390c95cf1435c19adcb22263b27750ea3ca81e7 (diff) |
style cleanup
Diffstat (limited to 'source/blender/editors')
-rw-r--r-- | source/blender/editors/armature/editarmature.c | 2 | ||||
-rw-r--r-- | source/blender/editors/curve/editcurve.c | 4 | ||||
-rw-r--r-- | source/blender/editors/object/object_select.c | 2 | ||||
-rw-r--r-- | source/blender/editors/render/render_preview.c | 2 | ||||
-rw-r--r-- | source/blender/editors/screen/area.c | 2 | ||||
-rw-r--r-- | source/blender/editors/screen/screen_edit.c | 2 | ||||
-rw-r--r-- | source/blender/editors/sculpt_paint/paint_image.c | 2 | ||||
-rw-r--r-- | source/blender/editors/space_graph/space_graph.c | 2 | ||||
-rw-r--r-- | source/blender/editors/uvedit/uvedit_ops.c | 2 | ||||
-rw-r--r-- | source/blender/editors/uvedit/uvedit_parametrizer.c | 5 |
10 files changed, 13 insertions, 12 deletions
diff --git a/source/blender/editors/armature/editarmature.c b/source/blender/editors/armature/editarmature.c index e0aa33d0207..dd2400ca302 100644 --- a/source/blender/editors/armature/editarmature.c +++ b/source/blender/editors/armature/editarmature.c @@ -4775,7 +4775,7 @@ static void envelope_bone_weighting(Object *ob, Mesh *mesh, float (*verts)[3], i distance = distfactor_to_bone(verts[i], root[j], tip[j], bone->rad_head * scale, bone->rad_tail * scale, bone->dist * scale); - /* add the vert to the deform group if weight!=0.0 */ + /* add the vert to the deform group if (weight != 0.0) */ if (distance != 0.0f) ED_vgroup_vert_add(ob, dgroup, i, distance, WEIGHT_REPLACE); else diff --git a/source/blender/editors/curve/editcurve.c b/source/blender/editors/curve/editcurve.c index a9646aaabf4..bc154de9691 100644 --- a/source/blender/editors/curve/editcurve.c +++ b/source/blender/editors/curve/editcurve.c @@ -1427,8 +1427,8 @@ void CURVE_OT_separate(wmOperatorType *ot) static short isNurbselUV(Nurb *nu, int *u, int *v, int flag) { - /* return u!=-1: 1 row in u-direction selected. U has value between 0-pntsv - * return v!=-1: 1 column in v-direction selected. V has value between 0-pntsu + /* return (u != -1): 1 row in u-direction selected. U has value between 0-pntsv + * return (v != -1): 1 column in v-direction selected. V has value between 0-pntsu */ BPoint *bp; int a, b, sel; diff --git a/source/blender/editors/object/object_select.c b/source/blender/editors/object/object_select.c index c83331a8eb7..79ee57d3f91 100644 --- a/source/blender/editors/object/object_select.c +++ b/source/blender/editors/object/object_select.c @@ -416,7 +416,7 @@ static int object_select_linked_exec(bContext *C, wmOperator *op) if (nr == OBJECT_SELECT_LINKED_IPO) { // XXX old animation system - //if (ob->ipo==0) return OPERATOR_CANCELLED; + //if (ob->ipo == 0) return OPERATOR_CANCELLED; //object_select_all_by_ipo(C, ob->ipo) return OPERATOR_CANCELLED; } diff --git a/source/blender/editors/render/render_preview.c b/source/blender/editors/render/render_preview.c index 6357cb48a3d..29ebc51df3e 100644 --- a/source/blender/editors/render/render_preview.c +++ b/source/blender/editors/render/render_preview.c @@ -705,7 +705,7 @@ static void shader_preview_render(ShaderPreview *sp, ID *id, int split, int firs } else { /* validate owner */ - //if (ri->rect==NULL) + //if (ri->rect == NULL) // ri->rect= MEM_mallocN(sizeof(int)*ri->pr_rectx*ri->pr_recty, "BIF_previewrender"); //RE_ResultGet32(re, ri->rect); } diff --git a/source/blender/editors/screen/area.c b/source/blender/editors/screen/area.c index f8ca150e28e..47a086a2779 100644 --- a/source/blender/editors/screen/area.c +++ b/source/blender/editors/screen/area.c @@ -1297,7 +1297,7 @@ void area_copy_data(ScrArea *sa1, ScrArea *sa2, int swap_space) if (swap_space == 1) { SWAP(ListBase, sa1->spacedata, sa2->spacedata); /* exception: ensure preview is reset */ -// if (sa1->spacetype==SPACE_VIEW3D) +// if (sa1->spacetype == SPACE_VIEW3D) // XXX BIF_view3d_previewrender_free(sa1->spacedata.first); } else if (swap_space == 2) { diff --git a/source/blender/editors/screen/screen_edit.c b/source/blender/editors/screen/screen_edit.c index 48532c83e4c..dda4bfede9c 100644 --- a/source/blender/editors/screen/screen_edit.c +++ b/source/blender/editors/screen/screen_edit.c @@ -1483,7 +1483,7 @@ void ED_screen_set_scene(bContext *C, bScreen *screen, Scene *scene) if (!v3d->camera || !BKE_scene_base_find(scene, v3d->camera)) { v3d->camera = BKE_scene_camera_find(sc->scene); - // XXX if (sc==curscreen) handle_view3d_lock(); + // XXX if (sc == curscreen) handle_view3d_lock(); if (!v3d->camera) { ARegion *ar; for (ar = v3d->regionbase.first; ar; ar = ar->next) { diff --git a/source/blender/editors/sculpt_paint/paint_image.c b/source/blender/editors/sculpt_paint/paint_image.c index 789c77f16ae..05cc958aa43 100644 --- a/source/blender/editors/sculpt_paint/paint_image.c +++ b/source/blender/editors/sculpt_paint/paint_image.c @@ -1461,7 +1461,7 @@ static float project_paint_uvpixel_mask( /* This only works when the opacity dosnt change while painting, stylus pressure messes with this * so don't use it. */ - // if (ps->is_airbrush==0) mask *= BKE_brush_alpha_get(ps->brush); + // if (ps->is_airbrush == 0) mask *= BKE_brush_alpha_get(ps->brush); return mask; } diff --git a/source/blender/editors/space_graph/space_graph.c b/source/blender/editors/space_graph/space_graph.c index f4cb4ec3d05..a4611cf1453 100644 --- a/source/blender/editors/space_graph/space_graph.c +++ b/source/blender/editors/space_graph/space_graph.c @@ -488,7 +488,7 @@ static void graph_listener(ScrArea *sa, wmNotifier *wmn) // XXX: restore the case below if not enough updates occur... //default: - // if (wmn->data==ND_KEYS) + // if (wmn->data == ND_KEYS) // ED_area_tag_redraw(sa); } } diff --git a/source/blender/editors/uvedit/uvedit_ops.c b/source/blender/editors/uvedit/uvedit_ops.c index 0e129cb4dcb..67e06b1c33c 100644 --- a/source/blender/editors/uvedit/uvedit_ops.c +++ b/source/blender/editors/uvedit/uvedit_ops.c @@ -224,7 +224,7 @@ void ED_uvedit_assign_image(Main *bmain, Scene *scene, Object *obedit, Image *im else id_lib_extern(&ima->id); /* we also need to correct the aspect of uvs */ - if(tf->unwrap & TF_CORRECT_ASPECT) { + if (tf->unwrap & TF_CORRECT_ASPECT) { BMIter liter; BMLoop *l; diff --git a/source/blender/editors/uvedit/uvedit_parametrizer.c b/source/blender/editors/uvedit/uvedit_parametrizer.c index c6ded2a91cf..39a78ea934b 100644 --- a/source/blender/editors/uvedit/uvedit_parametrizer.c +++ b/source/blender/editors/uvedit/uvedit_parametrizer.c @@ -660,10 +660,11 @@ static void p_flush_uvs(PHandle *handle, PChart *chart) } for (f = chart->faces; f; f = f->nextlink) { - if(f->unwrap_flag) { + if (f->unwrap_flag) { if (handle->do_aspect) { *f->unwrap_flag |= TF_CORRECT_ASPECT; - } else { + } + else { *f->unwrap_flag &= ~TF_CORRECT_ASPECT; } } |