diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-04-21 16:51:47 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-04-21 16:51:47 +0400 |
commit | 6701933f5ce4598d2fc98bd27a5b8a4e58ca06e2 (patch) | |
tree | 86eb9432c2350152aa7d829bb7adf41cf9fd2bde /source/blender/editors | |
parent | 96b024333edf31fb02881b1c2fbacaf556a49439 (diff) |
style cleanup
Diffstat (limited to 'source/blender/editors')
28 files changed, 49 insertions, 43 deletions
diff --git a/source/blender/editors/armature/meshlaplacian.c b/source/blender/editors/armature/meshlaplacian.c index 4c1315e847e..59a7437e753 100644 --- a/source/blender/editors/armature/meshlaplacian.c +++ b/source/blender/editors/armature/meshlaplacian.c @@ -183,7 +183,7 @@ static void laplacian_triangle_area(LaplacianSystem *sys, int i1, int i2, int i3 t2= cotan_weight(v2, v3, v1); t3= cotan_weight(v3, v1, v2); - if (angle_v3v3v3(v2, v1, v3) > DEG2RADF(90.0f)) obtuse= 1; + if (angle_v3v3v3(v2, v1, v3) > DEG2RADF(90.0f)) obtuse= 1; else if (angle_v3v3v3(v1, v2, v3) > DEG2RADF(90.0f)) obtuse= 2; else if (angle_v3v3v3(v1, v3, v2) > DEG2RADF(90.0f)) obtuse= 3; diff --git a/source/blender/editors/curve/editcurve.c b/source/blender/editors/curve/editcurve.c index 2e9aa8ec675..775b28bab5b 100644 --- a/source/blender/editors/curve/editcurve.c +++ b/source/blender/editors/curve/editcurve.c @@ -2892,7 +2892,7 @@ static void subdividenurb(Object *obedit, int number_cuts) calchandlesNurb(nu); } - } /* End of 'if(nu->type == CU_BEZIER)' */ + } /* End of 'if (nu->type == CU_BEZIER)' */ else if (nu->pntsv==1) { /* * All flat lines (ie. co-planar), except flat Nurbs. Flat NURB curves @@ -3085,7 +3085,7 @@ static void subdividenurb(Object *obedit, int number_cuts) nu->pntsv= (number_cuts+1)*nu->pntsv-number_cuts; nurbs_knot_calc_u(nu); nurbs_knot_calc_v(nu); - } /* End of 'if(sel== nu->pntsu*nu->pntsv)' (subdivide entire NURB) */ + } /* End of 'if (sel== nu->pntsu*nu->pntsv)' (subdivide entire NURB) */ else { /* subdivide in v direction? */ sel= 0; @@ -3177,7 +3177,7 @@ static void subdividenurb(Object *obedit, int number_cuts) MEM_freeN(usel); MEM_freeN(vsel); - } /* End of 'if(nu->type == CU_NURBS)' */ + } /* End of 'if (nu->type == CU_NURBS)' */ } } diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c index cce60d0c578..a7ff1565c3d 100644 --- a/source/blender/editors/interface/interface_handlers.c +++ b/source/blender/editors/interface/interface_handlers.c @@ -1017,7 +1017,7 @@ static void ui_apply_button(bContext *C, uiBlock *block, uiBut *but, uiHandleBut ui_apply_but_BLOCK(C, but, data); break; case COL: - if(data->cancel) + if (data->cancel) ui_apply_but_VEC(C, but, data); else ui_apply_but_BLOCK(C, but, data); @@ -2062,7 +2062,7 @@ static void ui_blockopen_begin(bContext *C, uiBut *but, uiHandleButtonData *data } /* this makes adjacent blocks auto open from now on */ - //if(but->block->auto_open==0) but->block->auto_open= 1; + //if (but->block->auto_open==0) but->block->auto_open= 1; } static void ui_blockopen_end(bContext *C, uiBut *but, uiHandleButtonData *data) diff --git a/source/blender/editors/mesh/editface.c b/source/blender/editors/mesh/editface.c index f38bdb1ebe3..294a39eddf8 100644 --- a/source/blender/editors/mesh/editface.c +++ b/source/blender/editors/mesh/editface.c @@ -735,8 +735,8 @@ typedef struct MirrTopoVert_t { static int mirrtopo_hash_sort(const void *l1, const void *l2) { - if ((MirrTopoHash_t)(intptr_t)l1 > (MirrTopoHash_t)(intptr_t)l2) return 1; - else if ((MirrTopoHash_t)(intptr_t)l1 < (MirrTopoHash_t)(intptr_t)l2) return -1; + if ((MirrTopoHash_t)(intptr_t)l1 > (MirrTopoHash_t)(intptr_t)l2) return 1; + else if ((MirrTopoHash_t)(intptr_t)l1 < (MirrTopoHash_t)(intptr_t)l2) return -1; return 0; } diff --git a/source/blender/editors/mesh/editmesh_select.c b/source/blender/editors/mesh/editmesh_select.c index 12fa5f66a69..50dcaff6a97 100644 --- a/source/blender/editors/mesh/editmesh_select.c +++ b/source/blender/editors/mesh/editmesh_select.c @@ -1418,7 +1418,7 @@ static int edbm_shortest_path_select_invoke(bContext *C, wmOperator *UNUSED(op), static int edbm_shortest_path_select_poll(bContext *C) { - if(ED_operator_editmesh_region_view3d(C)) { + if (ED_operator_editmesh_region_view3d(C)) { Object *obedit = CTX_data_edit_object(C); BMEditMesh *em = BMEdit_FromObject(obedit); return (em->selectmode & SCE_SELECT_EDGE) != 0; @@ -1907,7 +1907,7 @@ static int edbm_select_linked_exec(bContext *C, wmOperator *op) } BMW_end(&walker); } - else { + else { BM_ITER_MESH (v, &iter, em->bm, BM_VERTS_OF_MESH) { if (BM_elem_flag_test(v, BM_ELEM_SELECT)) { BM_elem_flag_enable(v, BM_ELEM_TAG); diff --git a/source/blender/editors/mesh/editmesh_slide.c b/source/blender/editors/mesh/editmesh_slide.c index 6534210601c..0d49356d9d9 100644 --- a/source/blender/editors/mesh/editmesh_slide.c +++ b/source/blender/editors/mesh/editmesh_slide.c @@ -685,7 +685,10 @@ static int edbm_vertex_slide_exec(bContext *C, wmOperator *op) start_vert = (BMVert *)ese->ele; /* Prepare operator */ - if (!EDBM_op_init(em, &bmop, op, "vertex_slide vert=%e edge=%hev distance_t=%f", start_vert, BM_ELEM_SELECT, distance_t)) { + if (!EDBM_op_init(em, &bmop, op, + "vertex_slide vert=%e edge=%hev distance_t=%f", + start_vert, BM_ELEM_SELECT, distance_t)) + { return OPERATOR_CANCELLED; } /* Execute operator */ diff --git a/source/blender/editors/object/object_bake.c b/source/blender/editors/object/object_bake.c index deefcfd6989..1f012c6f0be 100644 --- a/source/blender/editors/object/object_bake.c +++ b/source/blender/editors/object/object_bake.c @@ -345,7 +345,7 @@ static void bake_rasterize(const MBakeRast *bake_rast, const float st0_in[2], co yhi_beg= (int) ceilf(tmi); yhi= (int) ceilf(thi); - /*if(fTmi>ceilf(fTlo))*/ + /*if (fTmi>ceilf(fTlo))*/ rasterize_half(bake_rast, slo, tlo, smi, tmi, slo, tlo, shi, thi, ylo, yhi_beg, is_mid_right); rasterize_half(bake_rast, smi, tmi, shi, thi, slo, tlo, shi, thi, yhi_beg, yhi, is_mid_right); } diff --git a/source/blender/editors/object/object_relations.c b/source/blender/editors/object/object_relations.c index 7ee57dd78d3..be26007e25a 100644 --- a/source/blender/editors/object/object_relations.c +++ b/source/blender/editors/object/object_relations.c @@ -1479,7 +1479,7 @@ static void single_obdata_users(Main *bmain, Scene *scene, int flag) case OB_MESH: ob->data= copy_mesh(ob->data); //me= ob->data; - //if(me && me->key) + //if (me && me->key) // ipo_idnew(me->key->ipo); /* drivers */ break; case OB_MBALL: diff --git a/source/blender/editors/object/object_select.c b/source/blender/editors/object/object_select.c index 53726d70cf9..388766f5fa3 100644 --- a/source/blender/editors/object/object_select.c +++ b/source/blender/editors/object/object_select.c @@ -233,7 +233,7 @@ static int object_select_linked_exec(bContext *C, wmOperator *op) if (nr==1) { // XXX old animation system //ipo= ob->ipo; - //if(ipo==0) return OPERATOR_CANCELLED; + //if (ipo==0) return OPERATOR_CANCELLED; return OPERATOR_CANCELLED; } else if (nr==2) { @@ -266,7 +266,7 @@ static int object_select_linked_exec(bContext *C, wmOperator *op) CTX_DATA_BEGIN(C, Base*, base, visible_bases) { if (nr==1) { // XXX old animation system - //if(base->object->ipo==ipo) base->flag |= SELECT; + //if (base->object->ipo==ipo) base->flag |= SELECT; //changed = 1; } else if (nr==2) { diff --git a/source/blender/editors/render/render_preview.c b/source/blender/editors/render/render_preview.c index 67ece561c98..230917519e3 100644 --- a/source/blender/editors/render/render_preview.c +++ b/source/blender/editors/render/render_preview.c @@ -706,7 +706,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/sculpt_paint/paint_vertex.c b/source/blender/editors/sculpt_paint/paint_vertex.c index aad0a778d4b..bd448cc8288 100644 --- a/source/blender/editors/sculpt_paint/paint_vertex.c +++ b/source/blender/editors/sculpt_paint/paint_vertex.c @@ -360,7 +360,7 @@ static void make_vertexcol(Object *ob) /* single ob */ } } - //if(shade) + //if (shade) // shadeMeshMCol(scene, ob, me); //else @@ -822,7 +822,7 @@ static int sample_backbuf_area(ViewContext *vc, int *indexar, int totface, int x /* brecht: disabled this because it obviously fails for * brushes with size > 64, why is this here? */ - /*if(size > 64.0) size = 64.0;*/ + /*if (size > 64.0) size = 64.0;*/ ibuf = view3d_read_backbuf(vc, x - size, y - size, x + size, y + size); if (ibuf) { diff --git a/source/blender/editors/sculpt_paint/sculpt.c b/source/blender/editors/sculpt_paint/sculpt.c index baf4e17b584..bee4f0b754d 100644 --- a/source/blender/editors/sculpt_paint/sculpt.c +++ b/source/blender/editors/sculpt_paint/sculpt.c @@ -3082,9 +3082,9 @@ static void sculpt_update_cache_variants(bContext *C, Sculpt *sd, Object *ob, { copy_v2_v2(cache->tex_mouse, cache->mouse); - if ( (brush->mtex.brush_map_mode == MTEX_MAP_MODE_FIXED) && - (brush->flag & BRUSH_RANDOM_ROTATION) && - !(brush->flag & BRUSH_RAKE)) + if ((brush->mtex.brush_map_mode == MTEX_MAP_MODE_FIXED) && + (brush->flag & BRUSH_RANDOM_ROTATION) && + !(brush->flag & BRUSH_RAKE)) { cache->special_rotation = 2.0f * (float)M_PI * BLI_frand(); } diff --git a/source/blender/editors/space_file/file_draw.c b/source/blender/editors/space_file/file_draw.c index 516f6532c4a..87f32fe4eb8 100644 --- a/source/blender/editors/space_file/file_draw.c +++ b/source/blender/editors/space_file/file_draw.c @@ -503,7 +503,7 @@ void file_draw_list(const bContext *C, ARegion *ar) if (!(file->selflag & EDITING_FILE)) { - if ((params->active_file == i) || (file->selflag & HILITED_FILE) || (file->selflag & SELECTED_FILE) ) { + if ((params->active_file == i) || (file->selflag & HILITED_FILE) || (file->selflag & SELECTED_FILE)) { int colorid = (file->selflag & SELECTED_FILE) ? TH_HILITE : TH_BACK; int shade = (params->active_file == i) || (file->selflag & HILITED_FILE) ? 20 : 0; draw_tile(sx, sy-1, layout->tile_w+4, sfile->layout->tile_h+layout->tile_border_y, colorid, shade); diff --git a/source/blender/editors/space_file/file_ops.c b/source/blender/editors/space_file/file_ops.c index eb706dcca75..7d1981a5a3b 100644 --- a/source/blender/editors/space_file/file_ops.c +++ b/source/blender/editors/space_file/file_ops.c @@ -191,7 +191,7 @@ static FileSelect file_select_do(bContext* C, int selected_idx) retval = FILE_SELECT_DIR; } } - else { + else { if (file->relname) { BLI_strncpy(params->file, file->relname, FILE_MAXFILE); } diff --git a/source/blender/editors/space_file/filelist.c b/source/blender/editors/space_file/filelist.c index a48fc6b23f6..d7c4056431f 100644 --- a/source/blender/editors/space_file/filelist.c +++ b/source/blender/editors/space_file/filelist.c @@ -641,7 +641,7 @@ struct ImBuf * filelist_geticon(struct FileList* filelist, int index) if ( strcmp(filelist->filelist[fidx].relname, "..") == 0) { ibuf = gSpecialFileImages[SPECIAL_IMG_PARENT]; } - else if ( strcmp(filelist->filelist[fidx].relname, ".") == 0) { + else if (strcmp(filelist->filelist[fidx].relname, ".") == 0) { ibuf = gSpecialFileImages[SPECIAL_IMG_REFRESH]; } else { diff --git a/source/blender/editors/space_file/filesel.c b/source/blender/editors/space_file/filesel.c index a7197cb31e6..31695ddd776 100644 --- a/source/blender/editors/space_file/filesel.c +++ b/source/blender/editors/space_file/filesel.c @@ -308,7 +308,7 @@ FileSelection ED_fileselect_layout_offset_rect(FileLayout* layout, const rcti* r CLAMP(rowmax, 0, layout->rows-1); } - if ( (colmin > layout->columns-1) || (rowmin > layout->rows-1) ) { + if ((colmin > layout->columns-1) || (rowmin > layout->rows-1)) { sel.first = -1; } else { @@ -317,7 +317,7 @@ FileSelection ED_fileselect_layout_offset_rect(FileLayout* layout, const rcti* r else sel.first = colmin + layout->columns*rowmin; } - if ( (colmax > layout->columns-1) || (rowmax > layout->rows-1) ) { + if ((colmax > layout->columns-1) || (rowmax > layout->rows-1)) { sel.last = -1; } else { diff --git a/source/blender/editors/space_image/image_buttons.c b/source/blender/editors/space_image/image_buttons.c index f116a246d72..9832cfb3227 100644 --- a/source/blender/editors/space_image/image_buttons.c +++ b/source/blender/editors/space_image/image_buttons.c @@ -154,7 +154,8 @@ static void image_info(Scene *scene, ImageUser *iuser, Image *ima, ImBuf *ibuf, } /* gets active viewer user */ -struct ImageUser *ntree_get_active_iuser(bNodeTree *ntree){ +struct ImageUser *ntree_get_active_iuser(bNodeTree *ntree) +{ bNode *node; if (ntree) diff --git a/source/blender/editors/space_image/space_image.c b/source/blender/editors/space_image/space_image.c index 3c1c8ac9941..6d0f0c9323f 100644 --- a/source/blender/editors/space_image/space_image.c +++ b/source/blender/editors/space_image/space_image.c @@ -546,7 +546,7 @@ static void image_keymap(struct wmKeyConfig *keyconf) RNA_boolean_set(kmi->ptr, "toggle", TRUE); /* fast switch to render slots */ - for(i = 0; i < MAX2(IMA_MAX_RENDER_SLOT, 9); i++) { + for (i = 0; i < MAX2(IMA_MAX_RENDER_SLOT, 9); i++) { kmi = WM_keymap_add_item(keymap, "WM_OT_context_set_int", ONEKEY+i, KM_PRESS, 0, 0); RNA_string_set(kmi->ptr, "data_path", "space_data.image.render_slot"); RNA_int_set(kmi->ptr, "value", i); diff --git a/source/blender/editors/space_node/node_draw.c b/source/blender/editors/space_node/node_draw.c index 23b700e5b64..040f921b6ac 100644 --- a/source/blender/editors/space_node/node_draw.c +++ b/source/blender/editors/space_node/node_draw.c @@ -672,7 +672,7 @@ static void node_draw_basis(const bContext *C, ARegion *ar, SpaceNode *snode, bN BLI_strncpy(showname, nodeLabel(node), sizeof(showname)); - //if(node->flag & NODE_MUTED) + //if (node->flag & NODE_MUTED) // BLI_snprintf(showname, sizeof(showname), "[%s]", showname); // XXX - don't print into self! uiDefBut(node->block, LABEL, 0, showname, (short)(rct->xmin+15), (short)(rct->ymax-NODE_DY), @@ -830,7 +830,7 @@ static void node_draw_hidden(const bContext *C, ARegion *ar, SpaceNode *snode, b if (node->miniwidth>0.0f) { BLI_strncpy(showname, nodeLabel(node), sizeof(showname)); - //if(node->flag & NODE_MUTED) + //if (node->flag & NODE_MUTED) // BLI_snprintf(showname, sizeof(showname), "[%s]", showname); // XXX - don't print into self! uiDefBut(node->block, LABEL, 0, showname, (short)(rct->xmin+15), (short)(centy-10), diff --git a/source/blender/editors/space_outliner/outliner_tools.c b/source/blender/editors/space_outliner/outliner_tools.c index c4fe337ba58..ba3637a88af 100644 --- a/source/blender/editors/space_outliner/outliner_tools.c +++ b/source/blender/editors/space_outliner/outliner_tools.c @@ -1200,7 +1200,7 @@ static int do_outliner_operation_event(bContext *C, Scene *scene, ARegion *ar, S set_operation_types(soops, &soops->tree, &scenelevel, &objectlevel, &idlevel, &datalevel); if (scenelevel) { - //if(objectlevel || datalevel || idlevel) error("Mixed selection"); + //if (objectlevel || datalevel || idlevel) error("Mixed selection"); //else pupmenu("Scene Operations%t|Delete"); } else if (objectlevel) { diff --git a/source/blender/editors/space_sequencer/sequencer_scopes.c b/source/blender/editors/space_sequencer/sequencer_scopes.c index 1d81d4bb68b..6b71591c471 100644 --- a/source/blender/editors/space_sequencer/sequencer_scopes.c +++ b/source/blender/editors/space_sequencer/sequencer_scopes.c @@ -247,7 +247,8 @@ ImBuf *make_waveform_view_from_ibuf(ImBuf *ibuf) } -static ImBuf *make_sep_waveform_view_from_ibuf_byte(ImBuf *ibuf){ +static ImBuf *make_sep_waveform_view_from_ibuf_byte(ImBuf *ibuf) +{ ImBuf *rval = IMB_allocImBuf( ibuf->x + 3, 515, 32, IB_rect); int x, y; diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c index 7a1d9b8604f..7ccf4b6c81a 100644 --- a/source/blender/editors/space_view3d/drawobject.c +++ b/source/blender/editors/space_view3d/drawobject.c @@ -182,11 +182,11 @@ static void draw_empty_cone(float size); static int check_object_draw_texture(Scene *scene, View3D *v3d, int drawtype) { /* texture and material draw modes */ - if(ELEM(v3d->drawtype, OB_TEXTURE, OB_MATERIAL) && drawtype > OB_SOLID) + if (ELEM(v3d->drawtype, OB_TEXTURE, OB_MATERIAL) && drawtype > OB_SOLID) return TRUE; /* textured solid */ - if(v3d->drawtype == OB_SOLID && (v3d->flag2 & V3D_SOLID_TEX) && !scene_use_new_shading_nodes(scene)) + if (v3d->drawtype == OB_SOLID && (v3d->flag2 & V3D_SOLID_TEX) && !scene_use_new_shading_nodes(scene)) return TRUE; return FALSE; @@ -6526,7 +6526,7 @@ void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, int flag) zbufoff = 1; dt = OB_SOLID; } - else if(ob->mode & (OB_MODE_VERTEX_PAINT | OB_MODE_WEIGHT_PAINT)) + else if (ob->mode & (OB_MODE_VERTEX_PAINT | OB_MODE_WEIGHT_PAINT)) dt = OB_PAINT; glEnable(GL_DEPTH_TEST); diff --git a/source/blender/editors/space_view3d/view3d_edit.c b/source/blender/editors/space_view3d/view3d_edit.c index 50eaa3b7ccc..082e7676daa 100644 --- a/source/blender/editors/space_view3d/view3d_edit.c +++ b/source/blender/editors/space_view3d/view3d_edit.c @@ -2987,7 +2987,7 @@ static int viewpan_exec(bContext *C, wmOperator *op) initgrabz(rv3d, 0.0, 0.0, 0.0); if (pandir == V3D_VIEW_PANRIGHT) { mval_f[0] = -32.0f; ED_view3d_win_to_delta(ar, mval_f, vec); } else if (pandir == V3D_VIEW_PANLEFT) { mval_f[0] = 32.0f; ED_view3d_win_to_delta(ar, mval_f, vec); } - else if (pandir == V3D_VIEW_PANUP) { mval_f[1] = -25.0f; ED_view3d_win_to_delta(ar, mval_f, vec); } + else if (pandir == V3D_VIEW_PANUP) { mval_f[1] = -25.0f; ED_view3d_win_to_delta(ar, mval_f, vec); } else if (pandir == V3D_VIEW_PANDOWN) { mval_f[1] = 25.0f; ED_view3d_win_to_delta(ar, mval_f, vec); } add_v3_v3(rv3d->ofs, vec); diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c index 59626349ac5..d1dbdbb09c7 100644 --- a/source/blender/editors/transform/transform.c +++ b/source/blender/editors/transform/transform.c @@ -4706,12 +4706,12 @@ void projectSVData(TransInfo *t, int final) if (!em) return; - if(!(t->settings->uvcalc_flag & UVCALC_TRANSFORM_CORRECT)) + if (!(t->settings->uvcalc_flag & UVCALC_TRANSFORM_CORRECT)) return; /* don't do this at all for non-basis shape keys, too easy to accidentally break uv maps or vertex colors then */ - if(em->bm->shapenr > 1) + if (em->bm->shapenr > 1) return; BLI_smallhash_init(&visit); diff --git a/source/blender/editors/transform/transform_conversions.c b/source/blender/editors/transform/transform_conversions.c index ba720ea8087..77573dbee4c 100644 --- a/source/blender/editors/transform/transform_conversions.c +++ b/source/blender/editors/transform/transform_conversions.c @@ -1984,7 +1984,7 @@ static void get_edge_center(float cent_r[3], BMVert *eve) static void VertsToTransData(TransInfo *t, TransData *td, BMEditMesh *em, BMVert *eve, float *bweight) { td->flag = 0; - //if(key) + //if (key) // td->loc = key->co; //else td->loc = eve->co; diff --git a/source/blender/editors/transform/transform_generics.c b/source/blender/editors/transform/transform_generics.c index a7f58373e41..bf6a47ed06c 100644 --- a/source/blender/editors/transform/transform_generics.c +++ b/source/blender/editors/transform/transform_generics.c @@ -921,7 +921,7 @@ void drawLine(TransInfo *t, float *center, float *dir, char axis, short options) glPushMatrix(); - //if(t->obedit) glLoadMatrixf(t->obedit->obmat); // sets opengl viewing + //if (t->obedit) glLoadMatrixf(t->obedit->obmat); // sets opengl viewing copy_v3_v3(v3, dir); diff --git a/source/blender/editors/uvedit/uvedit_parametrizer.c b/source/blender/editors/uvedit/uvedit_parametrizer.c index c99d6e992b7..c1abfe69cc1 100644 --- a/source/blender/editors/uvedit/uvedit_parametrizer.c +++ b/source/blender/editors/uvedit/uvedit_parametrizer.c @@ -4131,8 +4131,9 @@ void param_face_add(ParamHandle *handle, ParamKey key, int nverts, p_face_add_construct(phandle, key, vkeys, co, uv, 1, 2, 3, pin, select); } } - else if(!p_face_exists(phandle, vkeys, 0, 1, 2)) + else if (!p_face_exists(phandle, vkeys, 0, 1, 2)) { p_face_add_construct(phandle, key, vkeys, co, uv, 0, 1, 2, pin, select); + } } void param_edge_set_seam(ParamHandle *handle, ParamKey *vkeys) diff --git a/source/blender/editors/uvedit/uvedit_unwrap_ops.c b/source/blender/editors/uvedit/uvedit_unwrap_ops.c index ad78a5b6643..387b138cbfb 100644 --- a/source/blender/editors/uvedit/uvedit_unwrap_ops.c +++ b/source/blender/editors/uvedit/uvedit_unwrap_ops.c @@ -243,7 +243,7 @@ static ParamHandle *construct_param_handle(Scene *scene, BMEditMesh *em, key = (ParamKey)efa; - if(efa->len == 3 || efa->len == 4) { + if (efa->len == 3 || efa->len == 4) { /* for quads let parametrize split, it can make better decisions about which split is best for unwrapping than scanfill */ i = 0; @@ -294,7 +294,7 @@ static ParamHandle *construct_param_handle(Scene *scene, BMEditMesh *em, ls[1] = sefa->v2->tmp.p; ls[2] = sefa->v3->tmp.p; - for(i = 0; i < 3; i++) { + for (i = 0; i < 3; i++) { MLoopUV *luv = CustomData_bmesh_get(&em->bm->ldata, ls[i]->head.data, CD_MLOOPUV); vkeys[i] = (ParamKey)BM_elem_index_get(ls[i]->v); co[i] = ls[i]->v->co; |