[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [54958] trunk/blender/source: style cleanup: braces with multi-line statements, also add some comments.

Campbell Barton ideasman42 at gmail.com
Fri Mar 1 15:47:07 CET 2013


Revision: 54958
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=54958
Author:   campbellbarton
Date:     2013-03-01 14:47:06 +0000 (Fri, 01 Mar 2013)
Log Message:
-----------
style cleanup: braces with multi-line statements, also add some comments.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/mesh_validate.c
    trunk/blender/source/blender/blenkernel/intern/pbvh_bmesh.c
    trunk/blender/source/blender/bmesh/operators/bmo_hull.c
    trunk/blender/source/blender/editors/gpencil/gpencil_paint.c
    trunk/blender/source/blender/editors/interface/interface_templates.c
    trunk/blender/source/blender/editors/io/io_collada.c
    trunk/blender/source/blender/editors/mesh/editmesh_tools.c
    trunk/blender/source/blender/editors/object/object_vgroup.c
    trunk/blender/source/blender/editors/sculpt_paint/sculpt.c
    trunk/blender/source/blender/editors/space_file/file_ops.c
    trunk/blender/source/blender/editors/space_node/drawnode.c
    trunk/blender/source/blender/editors/space_view3d/view3d_edit.c
    trunk/blender/source/blender/editors/space_view3d/view3d_select.c
    trunk/blender/source/blender/ikplugin/intern/itasc_plugin.cpp
    trunk/blender/source/blender/makesdna/DNA_key_types.h
    trunk/blender/source/blender/makesrna/intern/rna_access.c
    trunk/blender/source/blender/python/intern/bpy_rna_anim.c
    trunk/blender/source/tools/check_style_c.py

Modified: trunk/blender/source/blender/blenkernel/intern/mesh_validate.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/mesh_validate.c	2013-03-01 14:28:38 UTC (rev 54957)
+++ trunk/blender/source/blender/blenkernel/intern/mesh_validate.c	2013-03-01 14:47:06 UTC (rev 54958)
@@ -908,6 +908,12 @@
 	                                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;

Modified: trunk/blender/source/blender/blenkernel/intern/pbvh_bmesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/pbvh_bmesh.c	2013-03-01 14:28:38 UTC (rev 54957)
+++ trunk/blender/source/blender/blenkernel/intern/pbvh_bmesh.c	2013-03-01 14:47:06 UTC (rev 54958)
@@ -805,7 +805,8 @@
 
 			/* 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);
 			}
 		}

Modified: trunk/blender/source/blender/bmesh/operators/bmo_hull.c
===================================================================
--- trunk/blender/source/blender/bmesh/operators/bmo_hull.c	2013-03-01 14:28:38 UTC (rev 54957)
+++ trunk/blender/source/blender/bmesh/operators/bmo_hull.c	2013-03-01 14:47:06 UTC (rev 54958)
@@ -154,8 +154,9 @@
 				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);
 				}
 			}

Modified: trunk/blender/source/blender/editors/gpencil/gpencil_paint.c
===================================================================
--- trunk/blender/source/blender/editors/gpencil/gpencil_paint.c	2013-03-01 14:28:38 UTC (rev 54957)
+++ trunk/blender/source/blender/editors/gpencil/gpencil_paint.c	2013-03-01 14:47:06 UTC (rev 54958)
@@ -931,7 +931,8 @@
 			
 			/* 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

Modified: trunk/blender/source/blender/editors/interface/interface_templates.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_templates.c	2013-03-01 14:28:38 UTC (rev 54957)
+++ trunk/blender/source/blender/editors/interface/interface_templates.c	2013-03-01 14:47:06 UTC (rev 54958)
@@ -2585,7 +2585,8 @@
 
 		/* 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;
 		}
 

Modified: trunk/blender/source/blender/editors/io/io_collada.c
===================================================================
--- trunk/blender/source/blender/editors/io/io_collada.c	2013-03-01 14:28:38 UTC (rev 54957)
+++ trunk/blender/source/blender/editors/io/io_collada.c	2013-03-01 14:47:06 UTC (rev 54958)
@@ -145,7 +145,8 @@
 	                   use_ngons,
 	                   use_object_instantiation,
 	                   sort_by_name,
-	                   second_life)) {
+	                   second_life))
+	{
 		return OPERATOR_FINISHED;
 	}
 	else {

Modified: trunk/blender/source/blender/editors/mesh/editmesh_tools.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editmesh_tools.c	2013-03-01 14:28:38 UTC (rev 54957)
+++ trunk/blender/source/blender/editors/mesh/editmesh_tools.c	2013-03-01 14:47:06 UTC (rev 54958)
@@ -3321,7 +3321,8 @@
 	
 	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;
 	}
 	

Modified: trunk/blender/source/blender/editors/object/object_vgroup.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_vgroup.c	2013-03-01 14:28:38 UTC (rev 54957)
+++ trunk/blender/source/blender/editors/object/object_vgroup.c	2013-03-01 14:47:06 UTC (rev 54958)
@@ -558,8 +558,10 @@
 			}
 
 			/* 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;

Modified: trunk/blender/source/blender/editors/sculpt_paint/sculpt.c
===================================================================
--- trunk/blender/source/blender/editors/sculpt_paint/sculpt.c	2013-03-01 14:28:38 UTC (rev 54957)
+++ trunk/blender/source/blender/editors/sculpt_paint/sculpt.c	2013-03-01 14:47:06 UTC (rev 54958)
@@ -3742,7 +3742,8 @@
 	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");

Modified: trunk/blender/source/blender/editors/space_file/file_ops.c
===================================================================
--- trunk/blender/source/blender/editors/space_file/file_ops.c	2013-03-01 14:28:38 UTC (rev 54957)
+++ trunk/blender/source/blender/editors/space_file/file_ops.c	2013-03-01 14:47:06 UTC (rev 54958)
@@ -1178,11 +1178,10 @@
 			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';
 		}

Modified: trunk/blender/source/blender/editors/space_node/drawnode.c
===================================================================
--- trunk/blender/source/blender/editors/space_node/drawnode.c	2013-03-01 14:28:38 UTC (rev 54957)
+++ trunk/blender/source/blender/editors/space_node/drawnode.c	2013-03-01 14:47:06 UTC (rev 54958)
@@ -1131,8 +1131,8 @@
 
 	/* 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;

Modified: trunk/blender/source/blender/editors/space_view3d/view3d_edit.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_edit.c	2013-03-01 14:28:38 UTC (rev 54957)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_edit.c	2013-03-01 14:47:06 UTC (rev 54958)
@@ -3699,6 +3699,8 @@
 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";

Modified: trunk/blender/source/blender/editors/space_view3d/view3d_select.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_select.c	2013-03-01 14:28:38 UTC (rev 54957)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_select.c	2013-03-01 14:47:06 UTC (rev 54958)
@@ -617,7 +617,8 @@
 	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 @@
 	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;

Modified: trunk/blender/source/blender/ikplugin/intern/itasc_plugin.cpp
===================================================================
--- trunk/blender/source/blender/ikplugin/intern/itasc_plugin.cpp	2013-03-01 14:28:38 UTC (rev 54957)
+++ trunk/blender/source/blender/ikplugin/intern/itasc_plugin.cpp	2013-03-01 14:47:06 UTC (rev 54958)
@@ -1519,7 +1519,8 @@
 	if (!ret ||
 	    !scene->addCache(ikscene->cache) ||
 	    !scene->addSolver(ikscene->solver) ||
-	    !scene->initialize()) {
+	    !scene->initialize())
+	{
 		delete ikscene;
 		ikscene = NULL;
 	}
@@ -1566,7 +1567,8 @@
 	if (ob->pose->ikdata) {
 		for (scene = ((IK_Data *)ob->pose->ikdata)->first;
 		     scene != NULL;

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list