[Bf-blender-cvs] [ae4ed68] master: Code cleanup: style

[Campbell Barton]

Commit: ae4ed68dfef8a97056b41393915ca853804dd8fe
Author: Campbell Barton
Date:   Fri Jun 6 07:54:05 2014 +1000
https://developer.blender.org/rBae4ed68dfef8a97056b41393915ca853804dd8fe

Code cleanup: style

===================================================================

M	intern/ghost/intern/GHOST_WindowCocoa.mm
M	source/blender/blenkernel/intern/displist.c
M	source/blender/editors/animation/anim_channels_edit.c
M	source/blender/editors/object/object_bake_api.c
M	source/blender/editors/render/render_shading.c
M	source/blender/editors/uvedit/uvedit_draw.c

===================================================================

diff --git a/intern/ghost/intern/GHOST_WindowCocoa.mm b/intern/ghost/intern/GHOST_WindowCocoa.mm
index 0dcc0ff..f833fb3 100644
--- a/intern/ghost/intern/GHOST_WindowCocoa.mm
+++ b/intern/ghost/intern/GHOST_WindowCocoa.mm
@@ -733,7 +733,7 @@ GHOST_WindowCocoa::GHOST_WindowCocoa(
 	//now has proper multi-monitor support for fullscreen
 	struct utsname retval;
 	uname(&retval);
-	if(retval.release[0] == '1' && retval.release[1] <= '3') {
+	if (retval.release[0] == '1' && retval.release[1] <= '3') {
 		m_lionStyleFullScreen = true;
 	}
 	
diff --git a/source/blender/blenkernel/intern/displist.c b/source/blender/blenkernel/intern/displist.c
index e3c56f3..613bb7c 100644
--- a/source/blender/blenkernel/intern/displist.c
+++ b/source/blender/blenkernel/intern/displist.c
@@ -1428,7 +1428,7 @@ static void calc_bevfac_mapping(
 		bevp_prev = (BevPoint *)(bl + 1);
 		bevp = bevp_prev + 1;
 
-		if (nu->type == CU_BEZIER){
+		if (nu->type == CU_BEZIER) {
 			bezt_prev = nu->bezt;
 			bezt = bezt_prev + 1;
 			for (i = 0, bevp_i = 0; i < segcount; i++, bezt_prev++, bezt++) {
@@ -1441,7 +1441,7 @@ static void calc_bevfac_mapping(
 					bevp_prev = bevp++;
 				}
 				else {
-					for (j = 0; j < resolu; j++, bevp_prev = bevp++){
+					for (j = 0; j < resolu; j++, bevp_prev = bevp++) {
 						l = len_v3v3(bevp->vec, bevp_prev->vec);
 						seglen += l;
 						BLI_assert(bevp_i < bl->nr - 1);
diff --git a/source/blender/editors/animation/anim_channels_edit.c b/source/blender/editors/animation/anim_channels_edit.c
index 7da8aee..c92ab04 100644
--- a/source/blender/editors/animation/anim_channels_edit.c
+++ b/source/blender/editors/animation/anim_channels_edit.c
@@ -841,7 +841,7 @@ static void rearrange_animchannel_add_to_islands(ListBase *islands, ListBase *sr
 	    (is_sel == 0) ||
 	    /* 4) hidden status changes */
 	    ((island->flag & REORDER_ISLAND_HIDDEN) != is_hidden)
-	   )
+	    )
 	{
 		/* create a new island now */
 		island = MEM_callocN(sizeof(tReorderChannelIsland), "tReorderChannelIsland");
diff --git a/source/blender/editors/object/object_bake_api.c b/source/blender/editors/object/object_bake_api.c
index 3f8393e..9075ca2 100644
--- a/source/blender/editors/object/object_bake_api.c
+++ b/source/blender/editors/object/object_bake_api.c
@@ -299,7 +299,7 @@ static bool bake_object_check(Object *ob, ReportList *reports)
 		BKE_reportf(reports, RPT_ERROR, "Object \"%s\" is not a mesh", ob->id.name + 2);
 		return false;
 	}
-	else  {
+	else {
 		Mesh *me = (Mesh *)ob->data;
 
 		const int pidx = CustomData_get_active_layer_index(&me->pdata, CD_MTEXPOLY);
@@ -774,11 +774,12 @@ static int bake(
 		/* make sure low poly renders */
 		ob_low->restrictflag &= ~OB_RESTRICT_RENDER;
 
-		if (RE_bake_has_engine(re))
+		if (RE_bake_has_engine(re)) {
 			ok = RE_bake_engine(re, ob_low, pixel_array_low, num_pixels, depth, pass_type, result);
+		}
 		else {
-				BKE_report(reports, RPT_ERROR, "Current render engine does not support baking");
-				goto cleanup;
+			BKE_report(reports, RPT_ERROR, "Current render engine does not support baking");
+			goto cleanup;
 		}
 	}
 
diff --git a/source/blender/editors/render/render_shading.c b/source/blender/editors/render/render_shading.c
index 79ab300..b91bc79 100644
--- a/source/blender/editors/render/render_shading.c
+++ b/source/blender/editors/render/render_shading.c
@@ -450,7 +450,8 @@ static int new_texture_exec(bContext *C, wmOperator *UNUSED(op))
 		tex->id.us--;
 
 		if (ptr.id.data && GS(((ID *)ptr.id.data)->name) == ID_MA &&
-		    RNA_property_pointer_get(&ptr, prop).id.data == NULL) {
+		    RNA_property_pointer_get(&ptr, prop).id.data == NULL)
+		{
 			/* In case we are assigning new texture to a material, and active slot was empty, reset 'use' flag. */
 			Material *ma = (Material *)ptr.id.data;
 			ma->septex &= ~(1 << ma->texact);
diff --git a/source/blender/editors/uvedit/uvedit_draw.c b/source/blender/editors/uvedit/uvedit_draw.c
index 8be56fd..7c2f71c 100644
--- a/source/blender/editors/uvedit/uvedit_draw.c
+++ b/source/blender/editors/uvedit/uvedit_draw.c
@@ -430,7 +430,7 @@ static void draw_uvs_other_mesh_new_shading(Object *ob, const Image *curimage)
 	for (a = me->totpoly; a != 0; a--, mpoly++) {
 		const int mat_nr = mpoly->mat_nr;
 		if ((mat_nr >= ob->totcol) ||
-			(BLI_BITMAP_GET(mat_test_array, mat_nr)) == 0)
+		    (BLI_BITMAP_GET(mat_test_array, mat_nr)) == 0)
 		{
 			continue;
 		}