[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [54567] trunk/blender/source/blender: style cleanup

[Campbell Barton]

Revision: 54567
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=54567
Author:   campbellbarton
Date:     2013-02-14 23:49:30 +0000 (Thu, 14 Feb 2013)
Log Message:
-----------
style cleanup

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/brush.c
    trunk/blender/source/blender/blenlib/intern/string_utf8.c
    trunk/blender/source/blender/compositor/operations/COM_InpaintOperation.cpp
    trunk/blender/source/blender/editors/space_view3d/view3d_draw.c
    trunk/blender/source/blender/editors/uvedit/uvedit_parametrizer.c
    trunk/blender/source/blender/python/bmesh/bmesh_py_types.c
    trunk/blender/source/blender/python/intern/bpy_app_translations.c

Modified: trunk/blender/source/blender/blenkernel/intern/brush.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/brush.c	2013-02-14 23:48:34 UTC (rev 54566)
+++ trunk/blender/source/blender/blenkernel/intern/brush.c	2013-02-14 23:49:30 UTC (rev 54567)
@@ -588,7 +588,7 @@
 				else if (texfall == 1) {
 					BKE_brush_sample_tex_2D(scene, brush, xy, dstf, 0);
 				}
-				else if (texfall == 2){
+				else if (texfall == 2) {
 					BKE_brush_sample_tex_2D(scene, brush, xy, rgba, 0);
 					mul_v3_v3v3(dstf, rgba, brush_rgb);
 					dstf[3] = rgba[3] * alpha * BKE_brush_curve_strength_clamp(brush, len_v2(xy), radius);

Modified: trunk/blender/source/blender/blenlib/intern/string_utf8.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/string_utf8.c	2013-02-14 23:48:34 UTC (rev 54566)
+++ trunk/blender/source/blender/blenlib/intern/string_utf8.c	2013-02-14 23:49:30 UTC (rev 54567)
@@ -114,7 +114,7 @@
 
 		/* Check for valid bytes after the 2nd, if any; all must start 10 */
 		while (--ab > 0) {
-			if ((*(p+1) & 0xc0) != 0x80) goto utf8_error;
+			if ((*(p + 1) & 0xc0) != 0x80) goto utf8_error;
 			p++; /* do this after so we get usable offset - campbell */
 		}
 	}

Modified: trunk/blender/source/blender/compositor/operations/COM_InpaintOperation.cpp
===================================================================
--- trunk/blender/source/blender/compositor/operations/COM_InpaintOperation.cpp	2013-02-14 23:48:34 UTC (rev 54566)
+++ trunk/blender/source/blender/compositor/operations/COM_InpaintOperation.cpp	2013-02-14 23:49:30 UTC (rev 54567)
@@ -84,8 +84,8 @@
 	ASSERT_XY_RANGE(x, y);
 
 	return &this->m_cached_buffer[
-	           y * width * COM_NUMBER_OF_CHANNELS
-	           + x * COM_NUMBER_OF_CHANNELS];
+	        y * width * COM_NUMBER_OF_CHANNELS +
+	        x * COM_NUMBER_OF_CHANNELS];
 }
 
 int InpaintSimpleOperation::mdist(int x, int y) 

Modified: trunk/blender/source/blender/editors/space_view3d/view3d_draw.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_draw.c	2013-02-14 23:48:34 UTC (rev 54566)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_draw.c	2013-02-14 23:49:30 UTC (rev 54567)
@@ -871,7 +871,7 @@
 static void draw_selected_name(Scene *scene, Object *ob, rcti *rect)
 {
 	char info[256], *markern;
-	short offset = 1.5f*UI_UNIT_X + rect->xmin;
+	short offset = 1.5f * UI_UNIT_X + rect->xmin;
 	
 	/* get name of marker on current frame (if available) */
 	markern = BKE_scene_find_marker_name(scene, CFRA);

Modified: trunk/blender/source/blender/editors/uvedit/uvedit_parametrizer.c
===================================================================
--- trunk/blender/source/blender/editors/uvedit/uvedit_parametrizer.c	2013-02-14 23:48:34 UTC (rev 54566)
+++ trunk/blender/source/blender/editors/uvedit/uvedit_parametrizer.c	2013-02-14 23:49:30 UTC (rev 54567)
@@ -3100,7 +3100,7 @@
 		if ((v1->flag & PVERT_PIN) && (v2->flag & PVERT_PIN) && (v3->flag & PVERT_PIN)) {
 			float area = p_face_uv_area_signed(f);
 
-			if(area > 0.0f)
+			if (area > 0.0f)
 				area_pinned_up += area;
 			else
 				area_pinned_down -= area;

Modified: trunk/blender/source/blender/python/bmesh/bmesh_py_types.c
===================================================================
--- trunk/blender/source/blender/python/bmesh/bmesh_py_types.c	2013-02-14 23:48:34 UTC (rev 54566)
+++ trunk/blender/source/blender/python/bmesh/bmesh_py_types.c	2013-02-14 23:49:30 UTC (rev 54567)
@@ -3658,7 +3658,7 @@
 		/* likely editmesh */
 		BMesh *bm = self->bm;
 		Scene *scene;
-		for(scene = G.main->scene.first; scene; scene = scene->id.next) {
+		for (scene = G.main->scene.first; scene; scene = scene->id.next) {
 			Base *base = scene->basact;
 			if (base && base->object->type == OB_MESH) {
 				Mesh *me = base->object->data;

Modified: trunk/blender/source/blender/python/intern/bpy_app_translations.c
===================================================================
--- trunk/blender/source/blender/python/intern/bpy_app_translations.c	2013-02-14 23:48:34 UTC (rev 54566)
+++ trunk/blender/source/blender/python/intern/bpy_app_translations.c	2013-02-14 23:49:30 UTC (rev 54567)
@@ -501,7 +501,9 @@
 #ifdef WITH_INTERNATIONAL
 	char *msgid, *msgctxt = NULL;
 
-	if (!PyArg_ParseTupleAndKeywords(args, kw, "s|z:bpy.app.translations.pgettext", (char **)kwlist, &msgid, &msgctxt))
+	if (!PyArg_ParseTupleAndKeywords(args, kw,
+	                                 "s|z:bpy.app.translations.pgettext",
+	                                 (char **)kwlist, &msgid, &msgctxt))
 	{
 		return NULL;
 	}
@@ -511,7 +513,9 @@
 	PyObject *msgid, *msgctxt;
 	(void)_pgettext;
 
-	if (!PyArg_ParseTupleAndKeywords(args, kw, "O|O:bpy.app.translations.pgettext", (char **)kwlist, &msgid, &msgctxt))
+	if (!PyArg_ParseTupleAndKeywords(args, kw,
+	                                 "O|O:bpy.app.translations.pgettext",
+	                                 (char **)kwlist, &msgid, &msgctxt))
 	{
 		return NULL;
 	}