style cleanup
authorCampbell Barton <ideasman42@gmail.com>
Mon, 21 Oct 2013 23:35:08 +0000 (23:35 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 21 Oct 2013 23:35:08 +0000 (23:35 +0000)
source/blender/blenkernel/intern/editderivedmesh.c
source/blender/blenlib/intern/BLI_mempool.c
source/blender/bmesh/intern/bmesh_polygon.c
source/blender/bmesh/intern/bmesh_walkers_impl.c
source/blender/bmesh/operators/bmo_fill_grid.c
source/blender/compositor/operations/COM_FastGaussianBlurOperation.cpp
source/blender/editors/interface/interface.c
source/blender/editors/screen/screen_ops.c
source/blender/makesrna/intern/makesrna.c
source/blender/python/intern/bpy_app_ffmpeg.c

index f71bc83f5d356d8e9c89a55619db46b8c54736b4..6dd0efc9ab4c6058496d6323693578552836cf2b 100644 (file)
@@ -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;
                }
index 261e53f0f551cb1735239593a446a1c48b6a4f3e..28539d9ca3470430cf436c23d3a3b2f635236605 100644 (file)
@@ -584,7 +584,7 @@ void BLI_mempool_clear_ex(BLI_mempool *pool, const int totelem_reserve)
 
        /* free all after pool->maxchunks  */
 
-       for (mpchunk = BLI_findlink(&pool->chunks, (int)maxchunks); mpchunk; mpchunk = mpchunk_next)  {
+       for (mpchunk = BLI_findlink(&pool->chunks, (int)maxchunks); mpchunk; mpchunk = mpchunk_next) {
                mpchunk_next = mpchunk->next;
                BLI_remlink(&pool->chunks, mpchunk);
                mempool_chunk_free(mpchunk, pool->flag);
index 8a3abcb9b5e6c73903f00e87a04cae32fc002794..12ec3da9b696072d519812786cdb6d757099ecd6 100644 (file)
@@ -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;
                                                }
index 238b7b4aaaaf28bf9eb391b320c91bd13a4bf8c8..aca2f96dc18793ce1b13659678667dde922c174e 100644 (file)
@@ -37,7 +37,7 @@
 #include "intern/bmesh_walkers_private.h"
 
 /* pop into stack memory (common operation) */
-#define BMW_state_remove_r(walker, owalk)  { \
+#define BMW_state_remove_r(walker, owalk) { \
        memcpy(owalk, BMW_current_state(walker), sizeof(*(owalk))); \
        BMW_state_remove(walker); \
 } (void)0
index a4b1237bc5d9de543ab36ce039137ccdc14ec2e7..4e302a8ff63cd9dbc5402b5766310fc3b609df9d 100644 (file)
@@ -142,11 +142,11 @@ static void bm_loop_pair_from_verts(BMVert *v_a, BMVert *v_b,
 static void bm_loop_pair_test_copy(BMLoop *l_pair_a[2], BMLoop *l_pair_b[2])
 {
        /* if the first one is set, we know the second is too */
-       if (l_pair_a[0] && l_pair_b[0] == NULL)  {
+       if (l_pair_a[0] && l_pair_b[0] == NULL) {
                l_pair_b[0] = l_pair_a[1];
                l_pair_b[1] = l_pair_a[0];
        }
-       else if (l_pair_b[0] && l_pair_a[0] == NULL)  {
+       else if (l_pair_b[0] && l_pair_a[0] == NULL) {
                l_pair_a[0] = l_pair_b[1];
                l_pair_a[1] = l_pair_b[0];
        }
index aec1e1387c3765ae5acd9851e01aea0f1fd9d6f2..fd201fcbc11d1e6a00cb961de19b71dfca6a4915 100644 (file)
@@ -116,9 +116,10 @@ void FastGaussianBlurOperation::deinitExecution()
 
 void *FastGaussianBlurOperation::initializeTileData(rcti *rect)
 {
-/*     lockMutex();
-    if (!this->m_iirgaus) {
-        MemoryBuffer *newBuf = (MemoryBuffer *)this->m_inputProgram->initializeTileData(rect);
+#if 0
+       lockMutex();
+       if (!this->m_iirgaus) {
+               MemoryBuffer *newBuf = (MemoryBuffer *)this->m_inputProgram->initializeTileData(rect);
                MemoryBuffer *copy = newBuf->duplicate();
                updateSize();
 
@@ -144,9 +145,9 @@ void *FastGaussianBlurOperation::initializeTileData(rcti *rect)
        }
        unlockMutex();
        return this->m_iirgaus;
-}*/
+#else
 
-       lockMutex();
+       lockMutex();
        if (this->m_iirgaus) {
                // if this->m_iirgaus is set, we don't do tile rendering, so
                // we can return the already calculated cache
@@ -159,7 +160,7 @@ void *FastGaussianBlurOperation::initializeTileData(rcti *rect)
        if (use_tiles) {
                unlockMutex();
        }
+
        MemoryBuffer *buffer = (MemoryBuffer *)this->m_inputProgram->initializeTileData(NULL);
        rcti *buf_rect = buffer->getRect();
 
@@ -181,19 +182,20 @@ void *FastGaussianBlurOperation::initializeTileData(rcti *rect)
        }
        else {
                if (sx > 0.0f) {
-                       for (c = 0; c < COM_NUMBER_OF_CHANNELS; ++c)
+                       for (c = 0; c < COM_NUMBER_OF_CHANNELS; ++c)
                                IIR_gauss(tile, sx, c, 1);
-               }
+               }
                if (sy > 0.0f) {
                        for (c = 0; c < COM_NUMBER_OF_CHANNELS; ++c)
                                IIR_gauss(tile, sy, c, 2);
-               }
-       }
+               }
+       }
        if (!use_tiles) {
                this->m_iirgaus = tile;
                unlockMutex();
        }
        return tile;
+#endif
 }
 
 void FastGaussianBlurOperation::deinitializeTileData(rcti *rect, void *data)
index 9f6d326cd9590b2b8ffdf8b7ee4423127effa1bc..16e92f2bc186e0bae93b126d308542cbdab637cf 100644 (file)
@@ -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)
 {
index a325183dd78d3fb71dc407a8e5afab5a9a35c48e..3cecbbb767d1849a3893d73323aa8b88b925a364 100644 (file)
@@ -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;
index 71e4fd4efd5e377fe028826a01948c09d71c2bc6..b4b3fea09c72d2b9b56833621dbc5d711c6c1b8c 100644 (file)
@@ -3695,7 +3695,7 @@ static const char *cpp_classes = ""
 "         typename Tcollection_funcs>\n"
 "class Collection : public Tcollection_funcs {\n"
 "public:\n"
-"      Collection(const PointerRNA &p) : Tcollection_funcs(p), ptr(p)  {}\n"
+"      Collection(const PointerRNA &p) : Tcollection_funcs(p), ptr(p) {}\n"
 "\n"
 "      void begin(CollectionIterator<T, Tbegin, Tnext, Tend>& iter)\n"
 "      { iter.begin(ptr); }\n"
index 61e12c1cea0dc7b0fae0fa5fc88f52574a44143c..2f7577928c5af4329afff29f10a05a370746b407 100644 (file)
@@ -89,7 +89,7 @@ static PyObject *make_ffmpeg_info(void)
        PyStructSequence_SET_ITEM(ffmpeg_info, pos++, obj)
 
 #ifdef WITH_FFMPEG
-#  define FFMPEG_LIB_VERSION(lib)  { \
+#  define FFMPEG_LIB_VERSION(lib) { \
                curversion = lib ## _version(); \
                SetObjItem(Py_BuildValue("(iii)", \
                                         curversion >> 16, (curversion >> 8) % 256, curversion % 256)); \
@@ -97,7 +97,7 @@ static PyObject *make_ffmpeg_info(void)
                                                curversion >> 16, (curversion >> 8) % 256, curversion % 256)); \
 } (void)0
 #else
-#  define FFMPEG_LIB_VERSION(lib)  { \
+#  define FFMPEG_LIB_VERSION(lib) { \
                SetStrItem("Unknown"); \
                SetStrItem("Unknown"); \
 } (void)0