From 0ac07404baf41aef65367395b86957ab1efa655f Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Fri, 1 Mar 2013 14:47:06 +0000 Subject: style cleanup: braces with multi-line statements, also add some comments. --- source/blender/blenkernel/intern/mesh_validate.c | 6 ++++++ source/blender/blenkernel/intern/pbvh_bmesh.c | 3 ++- source/blender/bmesh/operators/bmo_hull.c | 5 +++-- source/blender/editors/gpencil/gpencil_paint.c | 3 ++- source/blender/editors/interface/interface_templates.c | 3 ++- source/blender/editors/io/io_collada.c | 3 ++- source/blender/editors/mesh/editmesh_tools.c | 3 ++- source/blender/editors/object/object_vgroup.c | 6 ++++-- source/blender/editors/sculpt_paint/sculpt.c | 3 ++- source/blender/editors/space_file/file_ops.c | 9 ++++----- source/blender/editors/space_node/drawnode.c | 4 ++-- source/blender/editors/space_view3d/view3d_edit.c | 2 ++ source/blender/editors/space_view3d/view3d_select.c | 6 ++++-- source/blender/ikplugin/intern/itasc_plugin.cpp | 6 ++++-- source/blender/makesdna/DNA_key_types.h | 4 ++++ source/blender/makesrna/intern/rna_access.c | 2 +- source/blender/python/intern/bpy_rna_anim.c | 3 ++- 17 files changed, 48 insertions(+), 23 deletions(-) diff --git a/source/blender/blenkernel/intern/mesh_validate.c b/source/blender/blenkernel/intern/mesh_validate.c index 128b9ae242e..74d3645ea66 100644 --- a/source/blender/blenkernel/intern/mesh_validate.c +++ b/source/blender/blenkernel/intern/mesh_validate.c @@ -908,6 +908,12 @@ int BKE_mesh_validate_dm(DerivedMesh *dm) TRUE, FALSE); } +/** + * Calculate edges from polygons + * + * \param mesh The mesh to add edges into + * \param update When true create new edges co-exist + */ void BKE_mesh_calc_edges(Mesh *mesh, int update) { CustomData edata; diff --git a/source/blender/blenkernel/intern/pbvh_bmesh.c b/source/blender/blenkernel/intern/pbvh_bmesh.c index e46e95617ed..386a8b27870 100644 --- a/source/blender/blenkernel/intern/pbvh_bmesh.c +++ b/source/blender/blenkernel/intern/pbvh_bmesh.c @@ -805,7 +805,8 @@ static void pbvh_bmesh_collapse_edge(PBVH *bvh, BMEdge *e, BMVert *v1, /* Ensure that v1 is in the new face's node */ if (!BLI_ghash_haskey(n->bm_unique_verts, v1) && - !BLI_ghash_haskey(n->bm_other_verts, v1)) { + !BLI_ghash_haskey(n->bm_other_verts, v1)) + { BLI_ghash_insert(n->bm_other_verts, v1, NULL); } } diff --git a/source/blender/bmesh/operators/bmo_hull.c b/source/blender/bmesh/operators/bmo_hull.c index 5d8689b9da6..5e2404c9919 100644 --- a/source/blender/bmesh/operators/bmo_hull.c +++ b/source/blender/bmesh/operators/bmo_hull.c @@ -154,8 +154,9 @@ static void hull_output_triangles(BMesh *bm, GHash *hull_triangles) const int next = (i == 2 ? 0 : i + 1); BMEdge *e = BM_edge_exists(t->v[i], t->v[next]); if (e && - BMO_elem_flag_test(bm, e, HULL_FLAG_INPUT) && - !BMO_elem_flag_test(bm, e, HULL_FLAG_HOLE)) { + BMO_elem_flag_test(bm, e, HULL_FLAG_INPUT) && + !BMO_elem_flag_test(bm, e, HULL_FLAG_HOLE)) + { BMO_elem_flag_enable(bm, e, HULL_FLAG_OUTPUT_GEOM); } } diff --git a/source/blender/editors/gpencil/gpencil_paint.c b/source/blender/editors/gpencil/gpencil_paint.c index 8cd2bd861bc..46815450bf2 100644 --- a/source/blender/editors/gpencil/gpencil_paint.c +++ b/source/blender/editors/gpencil/gpencil_paint.c @@ -931,7 +931,8 @@ static void gp_stroke_eraser_dostroke(tGPsdata *p, /* check that point segment of the boundbox of the eraser stroke */ if (((!ELEM(V2D_IS_CLIPPED, x0, y0)) && BLI_rcti_isect_pt(rect, x0, y0)) || - ((!ELEM(V2D_IS_CLIPPED, x1, y1)) && BLI_rcti_isect_pt(rect, x1, y1))) { + ((!ELEM(V2D_IS_CLIPPED, x1, y1)) && BLI_rcti_isect_pt(rect, x1, y1))) + { /* check if point segment of stroke had anything to do with * eraser region (either within stroke painted, or on its lines) * - this assumes that linewidth is irrelevant diff --git a/source/blender/editors/interface/interface_templates.c b/source/blender/editors/interface/interface_templates.c index bddd7f0c821..3a9c43c9539 100644 --- a/source/blender/editors/interface/interface_templates.c +++ b/source/blender/editors/interface/interface_templates.c @@ -2585,7 +2585,8 @@ void uiTemplateList(uiLayout *layout, bContext *C, const char *listtype_name, co /* if list length changes and active is out of view, scroll to it */ if ((ui_list->list_last_len != len) && - (activei < ui_list->list_scroll || activei >= ui_list->list_scroll + items)) { + (activei < ui_list->list_scroll || activei >= ui_list->list_scroll + items)) + { ui_list->list_scroll = activei; } diff --git a/source/blender/editors/io/io_collada.c b/source/blender/editors/io/io_collada.c index 7225b5c35d3..7eae20fc7f7 100644 --- a/source/blender/editors/io/io_collada.c +++ b/source/blender/editors/io/io_collada.c @@ -145,7 +145,8 @@ static int wm_collada_export_exec(bContext *C, wmOperator *op) use_ngons, use_object_instantiation, sort_by_name, - second_life)) { + second_life)) + { return OPERATOR_FINISHED; } else { diff --git a/source/blender/editors/mesh/editmesh_tools.c b/source/blender/editors/mesh/editmesh_tools.c index 1448b53d997..9d58e91b744 100644 --- a/source/blender/editors/mesh/editmesh_tools.c +++ b/source/blender/editors/mesh/editmesh_tools.c @@ -3321,7 +3321,8 @@ static int edbm_fill_exec(bContext *C, wmOperator *op) if (!EDBM_op_init(em, &bmop, op, "triangle_fill edges=%he use_beauty=%b", - BM_ELEM_SELECT, use_beauty)) { + BM_ELEM_SELECT, use_beauty)) + { return OPERATOR_CANCELLED; } diff --git a/source/blender/editors/object/object_vgroup.c b/source/blender/editors/object/object_vgroup.c index 2897b9ea7ee..ef882b2486b 100644 --- a/source/blender/editors/object/object_vgroup.c +++ b/source/blender/editors/object/object_vgroup.c @@ -558,8 +558,10 @@ static int ed_vgroup_transfer_weight(Object *ob_dst, Object *ob_src, bDeformGrou } /* Loop through the vertices.*/ - for (i = 0, dv_src = dv_array_src, dv_dst = dv_array_dst; i < me_dst->totvert; - i++, dv_dst++, dv_src++, mv_src++, mv_dst++) { + for (i = 0, dv_src = dv_array_src, dv_dst = dv_array_dst; + i < me_dst->totvert; + i++, dv_dst++, dv_src++, mv_src++, mv_dst++) + { if (*dv_dst == NULL) { continue; diff --git a/source/blender/editors/sculpt_paint/sculpt.c b/source/blender/editors/sculpt_paint/sculpt.c index 8ea04aabbea..e787b5e125a 100644 --- a/source/blender/editors/sculpt_paint/sculpt.c +++ b/source/blender/editors/sculpt_paint/sculpt.c @@ -3742,7 +3742,8 @@ static void sculpt_update_cache_invariants(bContext *C, Sculpt *sd, SculptSessio if (brush->sculpt_tool == SCULPT_TOOL_LAYER) { /* not supported yet for multires or dynamic topology */ if (!ss->multires && !ss->bm && !ss->layer_co && - (brush->flag & BRUSH_PERSISTENT)) { + (brush->flag & BRUSH_PERSISTENT)) + { if (!ss->layer_co) ss->layer_co = MEM_mallocN(sizeof(float) * 3 * ss->totvert, "sculpt mesh vertices copy"); diff --git a/source/blender/editors/space_file/file_ops.c b/source/blender/editors/space_file/file_ops.c index 9349abb4d8b..79a578a86d1 100644 --- a/source/blender/editors/space_file/file_ops.c +++ b/source/blender/editors/space_file/file_ops.c @@ -1178,11 +1178,10 @@ static void file_expand_directory(bContext *C) get_default_root(sfile->params->dir); } /* change "C:" --> "C:\", [#28102] */ - else if ( (isalpha(sfile->params->dir[0]) && - (sfile->params->dir[1] == ':')) && - (sfile->params->dir[2] == '\0') - - ) { + else if ((isalpha(sfile->params->dir[0]) && + (sfile->params->dir[1] == ':')) && + (sfile->params->dir[2] == '\0')) + { sfile->params->dir[2] = '\\'; sfile->params->dir[3] = '\0'; } diff --git a/source/blender/editors/space_node/drawnode.c b/source/blender/editors/space_node/drawnode.c index b211bca4c0a..72b8d0381df 100644 --- a/source/blender/editors/space_node/drawnode.c +++ b/source/blender/editors/space_node/drawnode.c @@ -1131,8 +1131,8 @@ static void node_draw_reroute(const bContext *C, ARegion *ar, SpaceNode *UNUSED( /* skip if out of view */ if (node->totr.xmax < ar->v2d.cur.xmin || node->totr.xmin > ar->v2d.cur.xmax || - node->totr.ymax < ar->v2d.cur.ymin || node->totr.ymin > ar->v2d.cur.ymax) { - + node->totr.ymax < ar->v2d.cur.ymin || node->totr.ymin > ar->v2d.cur.ymax) + { uiEndBlock(C, node->block); node->block = NULL; return; diff --git a/source/blender/editors/space_view3d/view3d_edit.c b/source/blender/editors/space_view3d/view3d_edit.c index c231a85d060..6b3b92955e3 100644 --- a/source/blender/editors/space_view3d/view3d_edit.c +++ b/source/blender/editors/space_view3d/view3d_edit.c @@ -3699,6 +3699,8 @@ static int background_image_add_invoke(bContext *C, wmOperator *op, wmEvent *UNU void VIEW3D_OT_background_image_add(wmOperatorType *ot) { /* identifiers */ + /* note: having key shortcut here is bad practice, + * but for now keep because this displays when dragging an image over the 3D viewport */ ot->name = "Add Background Image (Ctrl for Empty Object)"; ot->description = "Add a new background image"; ot->idname = "VIEW3D_OT_background_image_add"; diff --git a/source/blender/editors/space_view3d/view3d_select.c b/source/blender/editors/space_view3d/view3d_select.c index dac887f7f13..24260898066 100644 --- a/source/blender/editors/space_view3d/view3d_select.c +++ b/source/blender/editors/space_view3d/view3d_select.c @@ -617,7 +617,8 @@ static void do_lasso_select_lattice__doSelect(void *userData, BPoint *bp, const LassoSelectUserData *data = userData; if (BLI_rctf_isect_pt_v(data->rect_fl, screen_co) && - BLI_lasso_is_point_inside(data->mcords, data->moves, screen_co[0], screen_co[1], IS_CLIPPED)) { + BLI_lasso_is_point_inside(data->mcords, data->moves, screen_co[0], screen_co[1], IS_CLIPPED)) + { bp->f1 = data->select ? (bp->f1 | SELECT) : (bp->f1 & ~SELECT); } } @@ -717,7 +718,8 @@ static void do_lasso_select_mball__doSelectElem(void *userData, struct MetaElem LassoSelectUserData *data = userData; if (BLI_rctf_isect_pt_v(data->rect_fl, screen_co) && - BLI_lasso_is_point_inside(data->mcords, data->moves, screen_co[0], screen_co[1], INT_MAX)) { + BLI_lasso_is_point_inside(data->mcords, data->moves, screen_co[0], screen_co[1], INT_MAX)) + { if (data->select) ml->flag |= SELECT; else ml->flag &= ~SELECT; data->is_change = TRUE; diff --git a/source/blender/ikplugin/intern/itasc_plugin.cpp b/source/blender/ikplugin/intern/itasc_plugin.cpp index e1ef7d92bd0..96bdb6c9bdd 100644 --- a/source/blender/ikplugin/intern/itasc_plugin.cpp +++ b/source/blender/ikplugin/intern/itasc_plugin.cpp @@ -1519,7 +1519,8 @@ static IK_Scene *convert_tree(Scene *blscene, Object *ob, bPoseChannel *pchan, f if (!ret || !scene->addCache(ikscene->cache) || !scene->addSolver(ikscene->solver) || - !scene->initialize()) { + !scene->initialize()) + { delete ikscene; ikscene = NULL; } @@ -1566,7 +1567,8 @@ static int init_scene(Object *ob) if (ob->pose->ikdata) { for (scene = ((IK_Data *)ob->pose->ikdata)->first; scene != NULL; - scene = scene->next) { + scene = scene->next) + { if (fabs(scene->blScale - scale) > KDL::epsilon) return 1; scene->channels[0].pchan->flag |= POSE_IKTREE; diff --git a/source/blender/makesdna/DNA_key_types.h b/source/blender/makesdna/DNA_key_types.h index 6e5861043c1..4783247420c 100644 --- a/source/blender/makesdna/DNA_key_types.h +++ b/source/blender/makesdna/DNA_key_types.h @@ -29,6 +29,10 @@ /** \file DNA_key_types.h * \ingroup DNA + * + * This file defines structures for Shape-Keys (not animation keyframes), + * attached to Mesh, Curve and Lattice Data. Even though Key's are ID blocks they + * aren't intended to be shared between multiple data blocks as with other ID types. */ #include "DNA_defs.h" diff --git a/source/blender/makesrna/intern/rna_access.c b/source/blender/makesrna/intern/rna_access.c index d00a4832446..6035326e0ae 100644 --- a/source/blender/makesrna/intern/rna_access.c +++ b/source/blender/makesrna/intern/rna_access.c @@ -4864,7 +4864,7 @@ static char *rna_pointer_as_string__bldata(PointerRNA *ptr) } } -char *RNA_pointer_as_string(bContext *C, PointerRNA *ptr, PropertyRNA *prop_ptr, PointerRNA *ptr_prop) +char *RNA_pointer_as_string(bContext *C, PointerRNA *UNUSED(ptr), PropertyRNA *prop_ptr, PointerRNA *ptr_prop) { if (RNA_property_flag(prop_ptr) & PROP_IDPROPERTY) { return rna_pointer_as_string__idprop(C, ptr_prop); diff --git a/source/blender/python/intern/bpy_rna_anim.c b/source/blender/python/intern/bpy_rna_anim.c index a19f8e2d8ed..b61ed55da06 100644 --- a/source/blender/python/intern/bpy_rna_anim.c +++ b/source/blender/python/intern/bpy_rna_anim.c @@ -156,7 +156,8 @@ static int pyrna_struct_keyframe_parse( /* note, parse_str MUST start with 's|ifsO!' */ if (!PyArg_ParseTupleAndKeywords(args, kw, parse_str, (char **)kwlist, &path, index, cfra, group_name, - &PySet_Type, &pyoptions)) { + &PySet_Type, &pyoptions)) + { return -1; } -- cgit v1.2.3