[Bf-blender-cvs] [4abe548] master: cleanup: style

[Campbell Barton]

Commit: 4abe5485273894302d575251e72a1fa7d43f4231
Author: Campbell Barton
Date:   Fri Jan 2 19:18:57 2015 +1100
Branches: master
https://developer.blender.org/rB4abe5485273894302d575251e72a1fa7d43f4231

cleanup: style

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

M	intern/cycles/bvh/bvh.cpp
M	source/blender/blenkernel/intern/paint.c
M	source/blender/blenlib/intern/winstuff_dir.c
M	source/blender/bmesh/operators/bmo_similar.c
M	source/blender/editors/sculpt_paint/paint_image_proj.c
M	source/blender/editors/util/ed_util.c
M	source/blender/python/mathutils/mathutils_geometry.c

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

diff --git a/intern/cycles/bvh/bvh.cpp b/intern/cycles/bvh/bvh.cpp
index e6ce4d9..ac2762b 100644
--- a/intern/cycles/bvh/bvh.cpp
+++ b/intern/cycles/bvh/bvh.cpp
@@ -898,7 +898,7 @@ void QBVH::refit_node(int idx, bool leaf, BoundBox& bbox, uint& visibility)
 		 * no idea about BVHNode.
 		 *
 		 * Would be nice to de-duplicate code, but trying to make
-		 * making code more geenral ends up in much nastier code
+		 * making code more general ends up in much nastier code
 		 * in my opinion so far.
 		 *
 		 * Same applies to the inner nodes case below.
diff --git a/source/blender/blenkernel/intern/paint.c b/source/blender/blenkernel/intern/paint.c
index 2cd779a..5859124 100644
--- a/source/blender/blenkernel/intern/paint.c
+++ b/source/blender/blenkernel/intern/paint.c
@@ -533,7 +533,7 @@ void paint_calculate_rake_rotation(UnifiedPaintSettings *ups, Brush *brush, cons
 		}
 	}
 	else {
-		ups->brush_rotation = ups->brush_rotation_sec =0.0f;
+		ups->brush_rotation = ups->brush_rotation_sec = 0.0f;
 	}
 }
 
diff --git a/source/blender/blenlib/intern/winstuff_dir.c b/source/blender/blenlib/intern/winstuff_dir.c
index 3d669a8..b20da9c 100644
--- a/source/blender/blenlib/intern/winstuff_dir.c
+++ b/source/blender/blenlib/intern/winstuff_dir.c
@@ -45,11 +45,11 @@
 #include "utfconv.h"
 
 /* Note: MinGW (FREE_WINDOWS) has opendir() and _wopendir(), and only the
-* latter accepts a path name of wchar_t type.  Rather than messing up with
-* extra #ifdef's here and there, Blender's own implementations of opendir()
-* and related functions are used to properly support paths with non-ASCII
-* characters. (kjym3)
-*/
+ * latter accepts a path name of wchar_t type.  Rather than messing up with
+ * extra #ifdef's here and there, Blender's own implementations of opendir()
+ * and related functions are used to properly support paths with non-ASCII
+ * characters. (kjym3)
+ */
 
 DIR *opendir(const char *path)
 {
diff --git a/source/blender/bmesh/operators/bmo_similar.c b/source/blender/bmesh/operators/bmo_similar.c
index 1405d87..02462e3 100644
--- a/source/blender/bmesh/operators/bmo_similar.c
+++ b/source/blender/bmesh/operators/bmo_similar.c
@@ -247,7 +247,7 @@ void bmo_similar_faces_exec(BMesh *bm, BMOperator *op)
 						break;
 
 					case SIMFACE_SMOOTH:
-						if(BM_elem_flag_test(fm, BM_ELEM_SMOOTH) == BM_elem_flag_test(fs, BM_ELEM_SMOOTH)) {
+						if (BM_elem_flag_test(fm, BM_ELEM_SMOOTH) == BM_elem_flag_test(fs, BM_ELEM_SMOOTH)) {
 							BMO_elem_flag_enable(bm, fm, FACE_MARK);
 							cont = false;
 						}
diff --git a/source/blender/editors/sculpt_paint/paint_image_proj.c b/source/blender/editors/sculpt_paint/paint_image_proj.c
index 93401d4..12240be 100644
--- a/source/blender/editors/sculpt_paint/paint_image_proj.c
+++ b/source/blender/editors/sculpt_paint/paint_image_proj.c
@@ -187,7 +187,7 @@ typedef struct ProjPaintImage {
 	ImagePaintPartialRedraw *partRedrawRect;
 	volatile void **undoRect; /* only used to build undo tiles during painting */
 	unsigned short **maskRect; /* the mask accumulation must happen on canvas, not on space screen bucket.
-	                  * Here we store the mask rectangle */
+	                            * Here we store the mask rectangle */
 	bool **valid; /* store flag to enforce validation of undo rectangle */
 	int touch;
 } ProjPaintImage;
@@ -2496,10 +2496,10 @@ static void project_paint_face_init(const ProjPaintState *ps, const int thread_i
 				CLAMP(bounds_px.ymax, 0, ibuf->y);
 			}
 
-			/*
+#if 0
 			project_paint_undo_tiles_init(&bounds_px, ps->projImages + image_index, tmpibuf,
 			                              tile_width, threaded, ps->do_masking);
-			*/
+#endif
 			/* clip face and */
 
 			has_isect = 0;
diff --git a/source/blender/editors/util/ed_util.c b/source/blender/editors/util/ed_util.c
index 86b9696..32d4f2e 100644
--- a/source/blender/editors/util/ed_util.c
+++ b/source/blender/editors/util/ed_util.c
@@ -174,7 +174,7 @@ bool ED_editors_flush_edits(const bContext *C, bool for_render)
 			}
 			else {
 				/* Set reorder=false so that saving the file doesn't reorder
-			 * the BMesh's elements */
+				 * the BMesh's elements */
 				BKE_sculptsession_bm_to_me(ob, false);
 			}
 		}
diff --git a/source/blender/python/mathutils/mathutils_geometry.c b/source/blender/python/mathutils/mathutils_geometry.c
index 49f1253..67e4825 100644
--- a/source/blender/python/mathutils/mathutils_geometry.c
+++ b/source/blender/python/mathutils/mathutils_geometry.c
@@ -787,7 +787,7 @@ static PyObject *M_Geometry_intersect_point_tri(PyObject *UNUSED(self), PyObject
 
 	if (!PyArg_ParseTuple(
 	        args, "OOOO:intersect_point_tri",
-	        &py_pt, UNPACK3_EX(&, py_tri,)))
+	        &py_pt, UNPACK3_EX(&, py_tri, )))
 	{
 		return NULL;
 	}
@@ -833,7 +833,7 @@ static PyObject *M_Geometry_intersect_point_tri_2d(PyObject *UNUSED(self), PyObj
 
 	if (!PyArg_ParseTuple(
 	        args, "OOOO:intersect_point_tri_2d",
-	        &py_pt, UNPACK3_EX(&, py_tri,)))
+	        &py_pt, UNPACK3_EX(&, py_tri, )))
 	{
 		return NULL;
 	}
@@ -878,7 +878,7 @@ static PyObject *M_Geometry_intersect_point_quad_2d(PyObject *UNUSED(self), PyOb
 	
 	if (!PyArg_ParseTuple(
 	        args, "OOOOO:intersect_point_quad_2d",
-	        &py_pt, UNPACK4_EX(&, py_quad,)))
+	        &py_pt, UNPACK4_EX(&, py_quad, )))
 	{
 		return NULL;
 	}