style cleanup

source/blender/blenkernel/intern/editderivedmesh.c

@@ -902,7 +902,7 @@ static void emdm_pass_attrib_vertex_glsl(DMVertexAttribs *attribs, BMLoop *loop,
 	for (i = 0; i < attribs->tottface; i++) {
 		const float *uv;
 
-		if(attribs->tface[i].em_offset != -1) {
+		if (attribs->tface[i].em_offset != -1) {
 			const MLoopUV *luv = BM_ELEM_CD_GET_VOID_P(loop, attribs->tface[i].em_offset);
 			uv = luv->uv;
 		}
@@ -917,7 +917,7 @@ static void emdm_pass_attrib_vertex_glsl(DMVertexAttribs *attribs, BMLoop *loop,
 	}
 	for (i = 0; i < attribs->totmcol; i++) {
 		GLubyte col[4];
-		if(attribs->mcol[i].em_offset != -1) {
+		if (attribs->mcol[i].em_offset != -1) {
 			const MLoopCol *cp = BM_ELEM_CD_GET_VOID_P(loop, attribs->mcol[i].em_offset);
 			col[0] = cp->b; col[1] = cp->g; col[2] = cp->r; col[3] = cp->a;
 		}

source/blender/bmesh/intern/bmesh_polygon.c

@@ -944,7 +944,7 @@ void BM_face_triangulate(BMesh *bm, BMFace *f,
 
 		}
 
-		if ((!use_beauty) || (!r_faces_new)){
+		if ((!use_beauty) || (!r_faces_new)) {
 			/* we can't delete the real face, because some of the callers expect it to remain valid.
 			 * so swap data and delete the last created tri */
 			bmesh_face_swap_data(bm, f, f_new);
@@ -979,7 +979,8 @@ void BM_face_triangulate(BMesh *bm, BMFace *f,
 
 						if (nf_i < edge_array_len) {
 							r_faces_new[nf_i++] = f_a;
-						} else {
+						}
+						else {
 							f_new = f_a;
 							break;
 						}
@@ -990,7 +991,8 @@ void BM_face_triangulate(BMesh *bm, BMFace *f,
 
 						if (nf_i < edge_array_len) {
 							r_faces_new[nf_i++] = f_b;
-						} else {
+						}
+						else {
 							f_new = f_b;
 							break;
 						}

source/blender/compositor/operations/COM_FastGaussianBlurOperation.cpp

@@ -116,7 +116,8 @@ void FastGaussianBlurOperation::deinitExecution()
 
 void *FastGaussianBlurOperation::initializeTileData(rcti *rect)
 {
-/*	lockMutex();
+#if 0
+	lockMutex();
 	if (!this->m_iirgaus) {
 		MemoryBuffer *newBuf = (MemoryBuffer *)this->m_inputProgram->initializeTileData(rect);
 		MemoryBuffer *copy = newBuf->duplicate();
@@ -144,7 +145,7 @@ void *FastGaussianBlurOperation::initializeTileData(rcti *rect)
 	}
 	unlockMutex();
 	return this->m_iirgaus;
-}*/
+#else
 
 	lockMutex();
 	if (this->m_iirgaus) {
@@ -194,6 +195,7 @@ void *FastGaussianBlurOperation::initializeTileData(rcti *rect)
 		unlockMutex();
 	}
 	return tile;
+#endif
 }
 
 void FastGaussianBlurOperation::deinitializeTileData(rcti *rect, void *data)

source/blender/editors/interface/interface.c

@@ -3158,9 +3158,14 @@ uiBut *uiDefBut(uiBlock *block, int type, int retval, const char *str, int x, in
 	return but;
 }
 
-/* if _x_ is a power of two (only one bit) return the power,
+/**
+ * if \a _x_ is a power of two (only one bit) return the power,
  * otherwise return -1.
- * (1<<findBitIndex(x))==x for powers of two.
+ *
+ * for powers of two:
+ * \code{.c}
+ *     ((1 << findBitIndex(x)) == x);
+ * \endcode
  */
 static int findBitIndex(unsigned int x)
 {

source/blender/editors/screen/screen_ops.c

@@ -2142,7 +2142,8 @@ static int marker_jump_exec(bContext *C, wmOperator *op)
 				closest = marker->frame;
 				found = true;
 			}
-		} else {
+		}
+		else {
 			if (marker->frame < CFRA && (!found || closest < marker->frame)) {
 				closest = marker->frame;
 				found = true;