diff options
author | Campbell Barton <ideasman42@gmail.com> | 2016-03-05 01:09:05 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2016-03-05 01:12:07 +0300 |
commit | acebfbb6669b4f0c546068777c7f11146aad3def (patch) | |
tree | b20db009b21a703a4daa5400dbc72e8196e59a78 | |
parent | 55137629462d3ca2fb152b56cfe26507bdd2c352 (diff) |
Cleanup: unnecessary comma use
-rw-r--r-- | source/blender/blenkernel/intern/mesh.c | 6 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/subsurf_ccg.c | 8 | ||||
-rw-r--r-- | source/blender/editors/interface/interface.c | 10 | ||||
-rw-r--r-- | source/blender/editors/interface/interface_layout.c | 3 | ||||
-rw-r--r-- | source/blender/editors/space_text/text_autocomplete.c | 54 | ||||
-rw-r--r-- | source/blender/editors/space_text/text_draw.c | 22 | ||||
-rw-r--r-- | source/blender/gpu/intern/gpu_compositing.c | 3 | ||||
-rw-r--r-- | source/blender/render/intern/raytrace/rayobject_rtbuild.cpp | 3 | ||||
-rw-r--r-- | source/blender/render/intern/source/render_texture.c | 4 | ||||
-rw-r--r-- | source/blender/render/intern/source/volumetric.c | 4 | ||||
-rw-r--r-- | source/blender/render/intern/source/zbuf.c | 4 |
11 files changed, 86 insertions, 35 deletions
diff --git a/source/blender/blenkernel/intern/mesh.c b/source/blender/blenkernel/intern/mesh.c index 9d23fc450e2..c10592882c0 100644 --- a/source/blender/blenkernel/intern/mesh.c +++ b/source/blender/blenkernel/intern/mesh.c @@ -141,13 +141,15 @@ static int customdata_compare(CustomData *c1, CustomData *c2, Mesh *m1, Mesh *m2 while (i1 < c1->totlayer && !ELEM(l1->type, CD_MVERT, CD_MEDGE, CD_MPOLY, CD_MLOOPUV, CD_MLOOPCOL, CD_MTEXPOLY, CD_MDEFORMVERT)) { - i1++, l1++; + i1++; + l1++; } while (i2 < c2->totlayer && !ELEM(l2->type, CD_MVERT, CD_MEDGE, CD_MPOLY, CD_MLOOPUV, CD_MLOOPCOL, CD_MTEXPOLY, CD_MDEFORMVERT)) { - i2++, l2++; + i2++; + l2++; } if (l1->type == CD_MVERT) { diff --git a/source/blender/blenkernel/intern/subsurf_ccg.c b/source/blender/blenkernel/intern/subsurf_ccg.c index 61b759e6d2e..97994332411 100644 --- a/source/blender/blenkernel/intern/subsurf_ccg.c +++ b/source/blender/blenkernel/intern/subsurf_ccg.c @@ -1524,19 +1524,19 @@ static void ccgDM_copyFinalLoopArray(DerivedMesh *dm, MLoop *mloop) mv->v = v1; mv->e = GET_UINT_FROM_POINTER(BLI_edgehash_lookup(ccgdm->ehash, v1, v2)); - mv++, i++; + mv++; i++; mv->v = v2; mv->e = GET_UINT_FROM_POINTER(BLI_edgehash_lookup(ccgdm->ehash, v2, v3)); - mv++, i++; + mv++; i++; mv->v = v3; mv->e = GET_UINT_FROM_POINTER(BLI_edgehash_lookup(ccgdm->ehash, v3, v4)); - mv++, i++; + mv++; i++; mv->v = v4; mv->e = GET_UINT_FROM_POINTER(BLI_edgehash_lookup(ccgdm->ehash, v4, v1)); - mv++, i++; + mv++; i++; } } } diff --git a/source/blender/editors/interface/interface.c b/source/blender/editors/interface/interface.c index 32c9177fafe..c22055701ee 100644 --- a/source/blender/editors/interface/interface.c +++ b/source/blender/editors/interface/interface.c @@ -3577,11 +3577,11 @@ static int findBitIndex(unsigned int x) else { int idx = 0; - if (x & 0xFFFF0000) idx += 16, x >>= 16; - if (x & 0xFF00) idx += 8, x >>= 8; - if (x & 0xF0) idx += 4, x >>= 4; - if (x & 0xC) idx += 2, x >>= 2; - if (x & 0x2) idx += 1; + if (x & 0xFFFF0000) { idx += 16; x >>= 16; } + if (x & 0xFF00) { idx += 8; x >>= 8; } + if (x & 0xF0) { idx += 4; x >>= 4; } + if (x & 0xC) { idx += 2; x >>= 2; } + if (x & 0x2) { idx += 1; } return idx; } diff --git a/source/blender/editors/interface/interface_layout.c b/source/blender/editors/interface/interface_layout.c index 2daf3f7ba70..e802cf82b8e 100644 --- a/source/blender/editors/interface/interface_layout.c +++ b/source/blender/editors/interface/interface_layout.c @@ -2264,7 +2264,6 @@ static void ui_litem_layout_radial(uiLayout *litem) int itemnum = 0; int totitems = 0; - int minx, miny, maxx, maxy; /* For the radial layout we will use Matt Ebb's design * for radiation, see http://mattebb.com/weblog/radiation/ * also the old code at http://developer.blender.org/T5103 @@ -2275,7 +2274,7 @@ static void ui_litem_layout_radial(uiLayout *litem) x = litem->x; y = litem->y; - minx = x, miny = y, maxx = x, maxy = y; + int minx = x, miny = y, maxx = x, maxy = y; /* first count total items */ for (item = litem->items.first; item; item = item->next) diff --git a/source/blender/editors/space_text/text_autocomplete.c b/source/blender/editors/space_text/text_autocomplete.c index 2db2137784a..04cff288b03 100644 --- a/source/blender/editors/space_text/text_autocomplete.c +++ b/source/blender/editors/space_text/text_autocomplete.c @@ -327,8 +327,13 @@ static int text_autocomplete_modal(bContext *C, wmOperator *op, const wmEvent *e if (text_do_suggest_select(st, ar)) swallow = 1; else { - if (tools & TOOL_SUGG_LIST) texttool_suggest_clear(); - if (tools & TOOL_DOCUMENT) texttool_docs_clear(), doc_scroll = 0; + if (tools & TOOL_SUGG_LIST) { + texttool_suggest_clear(); + } + if (tools & TOOL_DOCUMENT) { + texttool_docs_clear(); + doc_scroll = 0; + } retval = OPERATOR_FINISHED; } draw = 1; @@ -342,8 +347,13 @@ static int text_autocomplete_modal(bContext *C, wmOperator *op, const wmEvent *e swallow = 1; } else { - if (tools & TOOL_SUGG_LIST) texttool_suggest_clear(); - if (tools & TOOL_DOCUMENT) texttool_docs_clear(), doc_scroll = 0; + if (tools & TOOL_SUGG_LIST) { + texttool_suggest_clear(); + } + if (tools & TOOL_DOCUMENT) { + texttool_docs_clear(); + doc_scroll = 0; + } retval = OPERATOR_FINISHED; } draw = 1; @@ -352,8 +362,13 @@ static int text_autocomplete_modal(bContext *C, wmOperator *op, const wmEvent *e case ESCKEY: if (event->val == KM_PRESS) { draw = swallow = 1; - if (tools & TOOL_SUGG_LIST) texttool_suggest_clear(); - else if (tools & TOOL_DOCUMENT) texttool_docs_clear(), doc_scroll = 0; + if (tools & TOOL_SUGG_LIST) { + texttool_suggest_clear(); + } + else if (tools & TOOL_DOCUMENT) { + texttool_docs_clear(); + doc_scroll = 0; + } else draw = swallow = 0; retval = OPERATOR_CANCELLED; } @@ -367,7 +382,11 @@ static int text_autocomplete_modal(bContext *C, wmOperator *op, const wmEvent *e swallow = 1; draw = 1; } - if (tools & TOOL_DOCUMENT) texttool_docs_clear(), doc_scroll = 0, draw = 1; + if (tools & TOOL_DOCUMENT) { + texttool_docs_clear(); + doc_scroll = 0; + draw = 1; + } retval = OPERATOR_FINISHED; } break; @@ -398,7 +417,10 @@ static int text_autocomplete_modal(bContext *C, wmOperator *op, const wmEvent *e } } } - if (tools & TOOL_DOCUMENT) texttool_docs_clear(), doc_scroll = 0; + if (tools & TOOL_DOCUMENT) { + texttool_docs_clear(); + doc_scroll = 0; + } } break; case RIGHTARROWKEY: @@ -427,7 +449,10 @@ static int text_autocomplete_modal(bContext *C, wmOperator *op, const wmEvent *e } } } - if (tools & TOOL_DOCUMENT) texttool_docs_clear(), doc_scroll = 0; + if (tools & TOOL_DOCUMENT) { + texttool_docs_clear(); + doc_scroll = 0; + } } break; case PAGEDOWNKEY: @@ -498,8 +523,15 @@ static int text_autocomplete_modal(bContext *C, wmOperator *op, const wmEvent *e break; #if 0 default: - if (tools & TOOL_SUGG_LIST) texttool_suggest_clear(), draw = 1; - if (tools & TOOL_DOCUMENT) texttool_docs_clear(), doc_scroll = 0, draw = 1; + if (tools & TOOL_SUGG_LIST) { + texttool_suggest_clear(); + draw = 1; + } + if (tools & TOOL_DOCUMENT) { + texttool_docs_clear(); + doc_scroll = 0; + draw = 1; + } #endif } diff --git a/source/blender/editors/space_text/text_draw.c b/source/blender/editors/space_text/text_draw.c index 16087921ab6..9448f6af69f 100644 --- a/source/blender/editors/space_text/text_draw.c +++ b/source/blender/editors/space_text/text_draw.c @@ -1108,8 +1108,13 @@ static void draw_cursor(SpaceText *st, ARegion *ar) vsell = txt_get_span(text->lines.first, text->sell) - st->top + offl; vselc = text_get_char_pos(st, text->sell->line, text->selc) - st->left + offc; - if (vcurc < 0) vcurc = 0; - if (vselc < 0) vselc = 0, hidden = 1; + if (vcurc < 0) { + vcurc = 0; + } + if (vselc < 0) { + vselc = 0; + hidden = 1; + } UI_ThemeColor(TH_SHADE2); x = st->showlinenrs ? TXT_OFFSET + TEXTXLOC : TXT_OFFSET; @@ -1135,11 +1140,16 @@ static void draw_cursor(SpaceText *st, ARegion *ar) } y -= froml * lheight; - glRecti(x + fromc * st->cwidth - 1, y, ar->winx, y - lheight); y -= lheight; - for (i = froml + 1; i < tol; i++) - glRecti(x - 4, y, ar->winx, y - lheight), y -= lheight; - glRecti(x - 4, y, x + toc * st->cwidth, y - lheight); y -= lheight; + glRecti(x + fromc * st->cwidth - 1, y, ar->winx, y - lheight); + y -= lheight; + for (i = froml + 1; i < tol; i++) { + glRecti(x - 4, y, ar->winx, y - lheight); + y -= lheight; + } + + glRecti(x - 4, y, x + toc * st->cwidth, y - lheight); + y -= lheight; } } else { diff --git a/source/blender/gpu/intern/gpu_compositing.c b/source/blender/gpu/intern/gpu_compositing.c index 79a77d63a44..8516a2d2882 100644 --- a/source/blender/gpu/intern/gpu_compositing.c +++ b/source/blender/gpu/intern/gpu_compositing.c @@ -332,7 +332,8 @@ bool GPU_fx_compositor_initialize_passes( /* scissor is missing when drawing offscreen, in that case, dimensions match exactly. In opposite case * add one to match viewport dimensions */ if (scissor_rect) { - w++, h++; + w++; + h++; } fx->num_passes = 0; diff --git a/source/blender/render/intern/raytrace/rayobject_rtbuild.cpp b/source/blender/render/intern/raytrace/rayobject_rtbuild.cpp index 1d67a8c4f44..00c1129fa85 100644 --- a/source/blender/render/intern/raytrace/rayobject_rtbuild.cpp +++ b/source/blender/render/intern/raytrace/rayobject_rtbuild.cpp @@ -331,7 +331,8 @@ int rtbuild_heuristic_object_split(RTBuilder *b, int nchilds) if (size > nchilds) { float bcost = FLT_MAX; - baxis = -1, boffset = size / 2; + baxis = -1; + boffset = size / 2; SweepCost *sweep = (SweepCost *)MEM_mallocN(sizeof(SweepCost) * size, "RTBuilder.HeuristicSweep"); diff --git a/source/blender/render/intern/source/render_texture.c b/source/blender/render/intern/source/render_texture.c index 193f619c09c..807686ab65c 100644 --- a/source/blender/render/intern/source/render_texture.c +++ b/source/blender/render/intern/source/render_texture.c @@ -3827,7 +3827,9 @@ void RE_sample_material_color( return; } - v1=mloop[mlooptri[tri_index].tri[0]].v, v2=mloop[mlooptri[tri_index].tri[1]].v, v3=mloop[mlooptri[tri_index].tri[2]].v; + v1 = mloop[mlooptri[tri_index].tri[0]].v; + v2 = mloop[mlooptri[tri_index].tri[1]].v; + v3 = mloop[mlooptri[tri_index].tri[2]].v; normal_tri_v3(normal, mvert[v1].co, mvert[v2].co, mvert[v3].co); /* generate shadeinput with data required */ diff --git a/source/blender/render/intern/source/volumetric.c b/source/blender/render/intern/source/volumetric.c index 2c0917243a3..610e86caa13 100644 --- a/source/blender/render/intern/source/volumetric.c +++ b/source/blender/render/intern/source/volumetric.c @@ -269,7 +269,9 @@ static float metadensity(Object *ob, const float co[3]) /* MB_BALL default */ switch (ml->type) { case MB_ELIPSOID: - tp[0] /= ml->expx, tp[1] /= ml->expy, tp[2] /= ml->expz; + tp[0] /= ml->expx; + tp[1] /= ml->expy; + tp[2] /= ml->expz; break; case MB_CUBE: tp[2] = (tp[2] > ml->expz) ? (tp[2] - ml->expz) : ((tp[2] < -ml->expz) ? (tp[2] + ml->expz) : 0.f); diff --git a/source/blender/render/intern/source/zbuf.c b/source/blender/render/intern/source/zbuf.c index 5fee6d2efb1..d3a1dcfd8ce 100644 --- a/source/blender/render/intern/source/zbuf.c +++ b/source/blender/render/intern/source/zbuf.c @@ -3250,7 +3250,9 @@ static void copyto_abufz(RenderPart *pa, int *arectz, int *rectmask, int sample) } } - rd++; rza++, rma++; + rza++; + rma++; + rd++; } } } |