From b56aabf815dd60827da81574501ea1d12ce3a38b Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sat, 21 Apr 2012 15:11:03 +0000 Subject: style cleanup: multi-line if statements. --- source/blender/editors/curve/editcurve.c | 9 ++++--- .../editors/interface/interface_templates.c | 4 ++-- source/blender/editors/physics/particle_edit.c | 3 +-- source/blender/editors/render/render_opengl.c | 2 +- source/blender/editors/sculpt_paint/paint_image.c | 4 ++-- source/blender/editors/sculpt_paint/sculpt_uv.c | 5 ++-- source/blender/editors/space_file/file_draw.c | 3 +-- source/blender/editors/space_file/filelist.c | 28 ++++++++++++---------- source/blender/editors/space_logic/logic_window.c | 12 +++++----- source/blender/editors/space_node/node_edit.c | 17 ++++++++----- .../editors/space_sequencer/sequencer_select.c | 8 ++++--- source/blender/editors/space_view3d/drawobject.c | 4 ++-- .../blender/editors/space_view3d/view3d_header.c | 5 +--- .../editors/transform/transform_conversions.c | 3 +-- .../blender/editors/transform/transform_generics.c | 3 ++- 15 files changed, 60 insertions(+), 50 deletions(-) (limited to 'source/blender/editors') diff --git a/source/blender/editors/curve/editcurve.c b/source/blender/editors/curve/editcurve.c index 4262b3d67d4..c19041b817e 100644 --- a/source/blender/editors/curve/editcurve.c +++ b/source/blender/editors/curve/editcurve.c @@ -2580,9 +2580,12 @@ static short nurb_has_selected_cps(ListBase *editnurb) bezt= nu->bezt; while (a--) { if (bezt->hide==0) { - if ((bezt->f1 & SELECT) - || (bezt->f2 & SELECT) - || (bezt->f3 & SELECT)) return 1; + if ((bezt->f1 & SELECT) || + (bezt->f2 & SELECT) || + (bezt->f3 & SELECT)) + { + return 1; + } } bezt++; } diff --git a/source/blender/editors/interface/interface_templates.c b/source/blender/editors/interface/interface_templates.c index 9a02b858731..d0f760d16fb 100644 --- a/source/blender/editors/interface/interface_templates.c +++ b/source/blender/editors/interface/interface_templates.c @@ -763,8 +763,8 @@ static uiLayout *draw_modifier(uiLayout *layout, Scene *scene, Object *ob, /* mode enabling buttons */ uiBlockBeginAlign(block); /* Softbody not allowed in this situation, enforce! */ - if ( ((md->type != eModifierType_Softbody && md->type != eModifierType_Collision) || !(ob->pd && ob->pd->deflect)) - && (md->type != eModifierType_Surface) ) + if (((md->type != eModifierType_Softbody && md->type != eModifierType_Collision) || !(ob->pd && ob->pd->deflect)) && + (md->type != eModifierType_Surface) ) { uiItemR(row, &ptr, "show_render", 0, "", ICON_NONE); uiItemR(row, &ptr, "show_viewport", 0, "", ICON_NONE); diff --git a/source/blender/editors/physics/particle_edit.c b/source/blender/editors/physics/particle_edit.c index 15b7294440a..5f22165176b 100644 --- a/source/blender/editors/physics/particle_edit.c +++ b/source/blender/editors/physics/particle_edit.c @@ -3471,8 +3471,7 @@ static void brush_edit_apply(bContext *C, wmOperator *op, PointerRNA *itemptr) pset->flag &= ~PE_LOCK_FIRST; if (((pset->brushtype == PE_BRUSH_ADD) ? - (sqrt(dx * dx + dy * dy) > pset->brush[PE_BRUSH_ADD].step) : (dx != 0 || dy != 0)) - || bedit->first) { + (sqrt(dx * dx + dy * dy) > pset->brush[PE_BRUSH_ADD].step) : (dx != 0 || dy != 0)) || bedit->first) { PEData data= bedit->data; view3d_operator_needs_opengl(C); diff --git a/source/blender/editors/render/render_opengl.c b/source/blender/editors/render/render_opengl.c index 2467d4327ed..f9737b02a01 100644 --- a/source/blender/editors/render/render_opengl.c +++ b/source/blender/editors/render/render_opengl.c @@ -471,7 +471,7 @@ static int screen_opengl_render_anim_step(bContext *C, wmOperator *op) Object *camera = NULL; /* update animated image textures for gpu, etc, - * call before scene_update_for_newframe so modifiers with textuers don't lag 1 frame */ + * call before scene_update_for_newframe so modifiers with textures don't lag 1 frame */ ED_image_update_frame(bmain, scene->r.cfra); /* go to next frame */ diff --git a/source/blender/editors/sculpt_paint/paint_image.c b/source/blender/editors/sculpt_paint/paint_image.c index 9f7cc7a75b1..d381aa5b536 100644 --- a/source/blender/editors/sculpt_paint/paint_image.c +++ b/source/blender/editors/sculpt_paint/paint_image.c @@ -5217,8 +5217,8 @@ static void brush_drawcursor(bContext *C, int x, int y, void *UNUSED(customdata) float alpha = 0.5f; ts = scene->toolsettings; - use_zoom = get_imapaint_zoom(C, &zoomx, &zoomy) - && !(ts->use_uv_sculpt && (scene->basact->object->mode == OB_MODE_EDIT)); + use_zoom = get_imapaint_zoom(C, &zoomx, &zoomy) && + !(ts->use_uv_sculpt && (scene->basact->object->mode == OB_MODE_EDIT)); if (use_zoom) { pixel_size = MAX2(size * zoomx, size * zoomy); diff --git a/source/blender/editors/sculpt_paint/sculpt_uv.c b/source/blender/editors/sculpt_paint/sculpt_uv.c index b4f8f689a6a..fd1c6984346 100644 --- a/source/blender/editors/sculpt_paint/sculpt_uv.c +++ b/source/blender/editors/sculpt_paint/sculpt_uv.c @@ -537,8 +537,9 @@ static UvSculptData *uv_sculpt_stroke_init(bContext *C, wmOperator *op, wmEvent /* Count 'unique' uvs */ for (i = 0; i < data->elementMap->totalUVs; i++) { - if (data->elementMap->buf[i].separate - && (!do_island_optimization || data->elementMap->buf[i].island == island_index)) { + if (data->elementMap->buf[i].separate && + (!do_island_optimization || data->elementMap->buf[i].island == island_index)) + { counter++; } } diff --git a/source/blender/editors/space_file/file_draw.c b/source/blender/editors/space_file/file_draw.c index 87f32fe4eb8..193fa2d2c65 100644 --- a/source/blender/editors/space_file/file_draw.c +++ b/source/blender/editors/space_file/file_draw.c @@ -155,8 +155,7 @@ void file_draw_buttons(const bContext *C, ARegion *ar) btn_margin + UI_GetStringWidth(params->title)); } - if (available_w <= loadbutton + separator + input_minw - || params->title[0] == 0) { + if (available_w <= loadbutton + separator + input_minw || params->title[0] == 0) { loadbutton = 0; } else { diff --git a/source/blender/editors/space_file/filelist.c b/source/blender/editors/space_file/filelist.c index d7c4056431f..45a271cc7e9 100644 --- a/source/blender/editors/space_file/filelist.c +++ b/source/blender/editors/space_file/filelist.c @@ -767,16 +767,18 @@ static int file_extension_type(const char *relname) else if (BLI_testextensie(relname, ".py")) { return PYSCRIPTFILE; } - else if (BLI_testextensie(relname, ".txt") - || BLI_testextensie(relname, ".glsl") - || BLI_testextensie(relname, ".data")) { + else if (BLI_testextensie(relname, ".txt") || + BLI_testextensie(relname, ".glsl") || + BLI_testextensie(relname, ".data")) + { return TEXTFILE; } - else if ( BLI_testextensie(relname, ".ttf") - || BLI_testextensie(relname, ".ttc") - || BLI_testextensie(relname, ".pfb") - || BLI_testextensie(relname, ".otf") - || BLI_testextensie(relname, ".otc")) { + else if (BLI_testextensie(relname, ".ttf") || + BLI_testextensie(relname, ".ttc") || + BLI_testextensie(relname, ".pfb") || + BLI_testextensie(relname, ".otf") || + BLI_testextensie(relname, ".otc")) + { return FTFONTFILE; } else if (BLI_testextensie(relname, ".btx")) { @@ -785,8 +787,9 @@ static int file_extension_type(const char *relname) else if (BLI_testextensie(relname, ".dae")) { return COLLADAFILE; } - else if (BLI_testextensie_array(relname, imb_ext_image) - || (G.have_quicktime && BLI_testextensie_array(relname, imb_ext_image_qt))) { + else if (BLI_testextensie_array(relname, imb_ext_image) || + (G.have_quicktime && BLI_testextensie_array(relname, imb_ext_image_qt))) + { return IMAGEFILE; } else if (BLI_testextensie_array(relname, imb_ext_movie)) { @@ -838,8 +841,9 @@ static void filelist_setfiletypes(struct FileList* filelist) } file->flags = file_extension_type(file->relname); - if (filelist->filter_glob - && BLI_testextensie_glob(file->relname, filelist->filter_glob)) { + if (filelist->filter_glob && + BLI_testextensie_glob(file->relname, filelist->filter_glob)) + { file->flags= OPERATORFILE; } diff --git a/source/blender/editors/space_logic/logic_window.c b/source/blender/editors/space_logic/logic_window.c index 0467579d0f2..f7c69c80067 100644 --- a/source/blender/editors/space_logic/logic_window.c +++ b/source/blender/editors/space_logic/logic_window.c @@ -3228,8 +3228,8 @@ static void draw_sensor_header(uiLayout *layout, PointerRNA *ptr, PointerRNA *lo } sub= uiLayoutRow(row, 0); - uiLayoutSetActive(sub, ((RNA_boolean_get(logic_ptr, "show_sensors_active_states") - && RNA_boolean_get(ptr, "show_expanded")) || RNA_boolean_get(ptr, "pin"))); + uiLayoutSetActive(sub, ((RNA_boolean_get(logic_ptr, "show_sensors_active_states") && + RNA_boolean_get(ptr, "show_expanded")) || RNA_boolean_get(ptr, "pin"))); uiItemR(sub, ptr, "pin", UI_ITEM_R_NO_BG, "", ICON_NONE); if (RNA_boolean_get(ptr, "show_expanded")==0) { @@ -3253,8 +3253,8 @@ static void draw_sensor_internal_header(uiLayout *layout, PointerRNA *ptr) uiItemR(row, ptr, "use_pulse_false_level", 0, "", ICON_DOTSDOWN); sub=uiLayoutRow(row, 0); - uiLayoutSetActive(sub, (RNA_boolean_get(ptr, "use_pulse_true_level") - || RNA_boolean_get(ptr, "use_pulse_false_level"))); + uiLayoutSetActive(sub, (RNA_boolean_get(ptr, "use_pulse_true_level") || + RNA_boolean_get(ptr, "use_pulse_false_level"))); uiItemR(sub, ptr, "frequency", 0, "Freq", ICON_NONE); row= uiLayoutRow(split, 1); @@ -3677,8 +3677,8 @@ static void draw_actuator_header(uiLayout *layout, PointerRNA *ptr, PointerRNA * } sub= uiLayoutRow(row, 0); - uiLayoutSetActive(sub, ((RNA_boolean_get(logic_ptr, "show_actuators_active_states") - && RNA_boolean_get(ptr, "show_expanded")) || RNA_boolean_get(ptr, "pin"))); + uiLayoutSetActive(sub, ((RNA_boolean_get(logic_ptr, "show_actuators_active_states") && + RNA_boolean_get(ptr, "show_expanded")) || RNA_boolean_get(ptr, "pin"))); uiItemR(sub, ptr, "pin", UI_ITEM_R_NO_BG, "", ICON_NONE); if (RNA_boolean_get(ptr, "show_expanded")==0) { diff --git a/source/blender/editors/space_node/node_edit.c b/source/blender/editors/space_node/node_edit.c index c41cb2b6211..dda06267237 100644 --- a/source/blender/editors/space_node/node_edit.c +++ b/source/blender/editors/space_node/node_edit.c @@ -695,8 +695,10 @@ void ED_node_set_active(Main *bmain, bNodeTree *ntree, bNode *node) static int inside_rctf(rctf *bounds, rctf *rect) { - return (bounds->xmin <= rect->xmin && bounds->xmax >= rect->xmax - && bounds->ymin <= rect->ymin && bounds->ymax >= rect->ymax); + return (bounds->xmin <= rect->xmin && + bounds->xmax >= rect->xmax && + bounds->ymin <= rect->ymin && + bounds->ymax >= rect->ymax); } static void node_frame_attach_nodes(bNodeTree *UNUSED(ntree), bNode *frame) @@ -1893,8 +1895,10 @@ static int outside_group_rect(SpaceNode *snode) { bNode *gnode= node_tree_get_editgroup(snode->nodetree); if (gnode) { - return (snode->mx < gnode->totr.xmin || snode->mx >= gnode->totr.xmax - || snode->my < gnode->totr.ymin || snode->my >= gnode->totr.ymax); + return (snode->mx < gnode->totr.xmin || + snode->mx >= gnode->totr.xmax || + snode->my < gnode->totr.ymin || + snode->my >= gnode->totr.ymax); } return 0; } @@ -2192,8 +2196,9 @@ static int node_duplicate_exec(bContext *C, wmOperator *op) /* This creates new links between copied nodes. * If keep_inputs is set, also copies input links from unselected (when fromnode==NULL)! */ - if (link->tonode && (link->tonode->flag & NODE_SELECT) - && (keep_inputs || (link->fromnode && (link->fromnode->flag & NODE_SELECT)))) { + if (link->tonode && (link->tonode->flag & NODE_SELECT) && + (keep_inputs || (link->fromnode && (link->fromnode->flag & NODE_SELECT)))) + { newlink = MEM_callocN(sizeof(bNodeLink), "bNodeLink"); newlink->flag = link->flag; newlink->tonode = link->tonode->new_node; diff --git a/source/blender/editors/space_sequencer/sequencer_select.c b/source/blender/editors/space_sequencer/sequencer_select.c index b8fc66cd3c3..2447ca6cfbe 100644 --- a/source/blender/editors/space_sequencer/sequencer_select.c +++ b/source/blender/editors/space_sequencer/sequencer_select.c @@ -1096,10 +1096,12 @@ static short select_grouped_effect_link(Editing *ed, Sequence *actseq) /* Ignore all seqs already selected! */ /* Ignore all seqs not sharing some time with active one. */ /* Ignore all seqs of incompatible types (audio vs video). */ - if ((seq->flag & SELECT) || (seq->startdisp >= enddisp) || (seq->enddisp < startdisp) - || (!is_audio && SEQ_IS_SOUND(seq)) - || (is_audio && !((seq->type == SEQ_META) || SEQ_IS_SOUND(seq)))) + if ((seq->flag & SELECT) || (seq->startdisp >= enddisp) || (seq->enddisp < startdisp) || + (!is_audio && SEQ_IS_SOUND(seq)) || + (is_audio && !((seq->type == SEQ_META) || SEQ_IS_SOUND(seq)))) + { continue; + } /* If the seq is an effect one, we need extra cheking! */ if (SEQ_IS_EFFECT(seq) && ((seq->seq1 && seq->seq1->tmp) || diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c index 7ccf4b6c81a..c6172492025 100644 --- a/source/blender/editors/space_view3d/drawobject.c +++ b/source/blender/editors/space_view3d/drawobject.c @@ -4341,8 +4341,8 @@ static void draw_new_particle_system(Scene *scene, View3D *v3d, RegionView3D *rv normalize_v3(imat[1]); } - if (ELEM3(draw_as, PART_DRAW_DOT, PART_DRAW_CROSS, PART_DRAW_LINE) - && part->draw_col > PART_DRAW_COL_MAT) + if (ELEM3(draw_as, PART_DRAW_DOT, PART_DRAW_CROSS, PART_DRAW_LINE) && + (part->draw_col > PART_DRAW_COL_MAT)) { create_cdata = 1; } diff --git a/source/blender/editors/space_view3d/view3d_header.c b/source/blender/editors/space_view3d/view3d_header.c index a3031bc3cfa..ab4eca2e303 100644 --- a/source/blender/editors/space_view3d/view3d_header.c +++ b/source/blender/editors/space_view3d/view3d_header.c @@ -294,10 +294,7 @@ static char *view3d_modeselect_pup(Scene *scene) if (!((ID *)ob->data)->lib) { /* if active object is editable */ - if ( ((ob->type == OB_MESH) - || (ob->type == OB_CURVE) || (ob->type == OB_SURF) || (ob->type == OB_FONT) - || (ob->type == OB_MBALL) || (ob->type == OB_LATTICE))) { - + if (ELEM6(ob->type, OB_MESH, OB_CURVE, OB_SURF, OB_FONT, OB_MBALL, OB_LATTICE)) { str += modeselect_addmode(str, N_("Edit Mode"), OB_MODE_EDIT, ICON_EDITMODE_HLT); } else if (ob->type == OB_ARMATURE) { diff --git a/source/blender/editors/transform/transform_conversions.c b/source/blender/editors/transform/transform_conversions.c index 77573dbee4c..fecd32c06a0 100644 --- a/source/blender/editors/transform/transform_conversions.c +++ b/source/blender/editors/transform/transform_conversions.c @@ -6005,8 +6005,7 @@ void createTransData(bContext *C, TransInfo *t) } } - else if (ob && (ob->mode & OB_MODE_PARTICLE_EDIT) - && PE_start_edit(PE_get_current(scene, ob))) { + else if (ob && (ob->mode & OB_MODE_PARTICLE_EDIT) && PE_start_edit(PE_get_current(scene, ob))) { createTransParticleVerts(C, t); t->flag |= T_POINTS; diff --git a/source/blender/editors/transform/transform_generics.c b/source/blender/editors/transform/transform_generics.c index bf6a47ed06c..0af4830e3c6 100644 --- a/source/blender/editors/transform/transform_generics.c +++ b/source/blender/editors/transform/transform_generics.c @@ -1629,7 +1629,8 @@ void calculatePropRatio(TransInfo *t) (td->flag & TD_NOTCONNECTED || td->dist > t->prop_size)) || (connected == 0 && - td->rdist > t->prop_size)) { + td->rdist > t->prop_size)) + { /* * The elements are sorted according to their dist member in the array, * that means we can stop when it finds one element outside of the propsize. -- cgit v1.2.3