[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60887] trunk/blender/source/blender: style cleanup
Campbell Barton
ideasman42 at gmail.com
Tue Oct 22 01:35:08 CEST 2013
Revision: 60887
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60887
Author: campbellbarton
Date: 2013-10-21 23:35:08 +0000 (Mon, 21 Oct 2013)
Log Message:
-----------
style cleanup
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/editderivedmesh.c
trunk/blender/source/blender/blenlib/intern/BLI_mempool.c
trunk/blender/source/blender/bmesh/intern/bmesh_polygon.c
trunk/blender/source/blender/bmesh/intern/bmesh_walkers_impl.c
trunk/blender/source/blender/bmesh/operators/bmo_fill_grid.c
trunk/blender/source/blender/compositor/operations/COM_FastGaussianBlurOperation.cpp
trunk/blender/source/blender/editors/interface/interface.c
trunk/blender/source/blender/editors/screen/screen_ops.c
trunk/blender/source/blender/makesrna/intern/makesrna.c
trunk/blender/source/blender/python/intern/bpy_app_ffmpeg.c
Modified: trunk/blender/source/blender/blenkernel/intern/editderivedmesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/editderivedmesh.c 2013-10-21 19:48:44 UTC (rev 60886)
+++ trunk/blender/source/blender/blenkernel/intern/editderivedmesh.c 2013-10-21 23:35:08 UTC (rev 60887)
@@ -902,7 +902,7 @@
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 @@
}
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;
}
Modified: trunk/blender/source/blender/blenlib/intern/BLI_mempool.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/BLI_mempool.c 2013-10-21 19:48:44 UTC (rev 60886)
+++ trunk/blender/source/blender/blenlib/intern/BLI_mempool.c 2013-10-21 23:35:08 UTC (rev 60887)
@@ -584,7 +584,7 @@
/* 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);
Modified: trunk/blender/source/blender/bmesh/intern/bmesh_polygon.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_polygon.c 2013-10-21 19:48:44 UTC (rev 60886)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_polygon.c 2013-10-21 23:35:08 UTC (rev 60887)
@@ -944,7 +944,7 @@
}
- 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 @@
if (nf_i < edge_array_len) {
r_faces_new[nf_i++] = f_a;
- } else {
+ }
+ else {
f_new = f_a;
break;
}
@@ -990,7 +991,8 @@
if (nf_i < edge_array_len) {
r_faces_new[nf_i++] = f_b;
- } else {
+ }
+ else {
f_new = f_b;
break;
}
Modified: trunk/blender/source/blender/bmesh/intern/bmesh_walkers_impl.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_walkers_impl.c 2013-10-21 19:48:44 UTC (rev 60886)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_walkers_impl.c 2013-10-21 23:35:08 UTC (rev 60887)
@@ -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
Modified: trunk/blender/source/blender/bmesh/operators/bmo_fill_grid.c
===================================================================
--- trunk/blender/source/blender/bmesh/operators/bmo_fill_grid.c 2013-10-21 19:48:44 UTC (rev 60886)
+++ trunk/blender/source/blender/bmesh/operators/bmo_fill_grid.c 2013-10-21 23:35:08 UTC (rev 60887)
@@ -142,11 +142,11 @@
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];
}
Modified: trunk/blender/source/blender/compositor/operations/COM_FastGaussianBlurOperation.cpp
===================================================================
--- trunk/blender/source/blender/compositor/operations/COM_FastGaussianBlurOperation.cpp 2013-10-21 19:48:44 UTC (rev 60886)
+++ trunk/blender/source/blender/compositor/operations/COM_FastGaussianBlurOperation.cpp 2013-10-21 23:35:08 UTC (rev 60887)
@@ -116,9 +116,10 @@
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 @@
}
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 @@
if (use_tiles) {
unlockMutex();
}
-
+
MemoryBuffer *buffer = (MemoryBuffer *)this->m_inputProgram->initializeTileData(NULL);
rcti *buf_rect = buffer->getRect();
@@ -181,19 +182,20 @@
}
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)
Modified: trunk/blender/source/blender/editors/interface/interface.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface.c 2013-10-21 19:48:44 UTC (rev 60886)
+++ trunk/blender/source/blender/editors/interface/interface.c 2013-10-21 23:35:08 UTC (rev 60887)
@@ -3158,9 +3158,14 @@
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)
{
Modified: trunk/blender/source/blender/editors/screen/screen_ops.c
===================================================================
--- trunk/blender/source/blender/editors/screen/screen_ops.c 2013-10-21 19:48:44 UTC (rev 60886)
+++ trunk/blender/source/blender/editors/screen/screen_ops.c 2013-10-21 23:35:08 UTC (rev 60887)
@@ -2142,7 +2142,8 @@
closest = marker->frame;
found = true;
}
- } else {
+ }
+ else {
if (marker->frame < CFRA && (!found || closest < marker->frame)) {
closest = marker->frame;
found = true;
Modified: trunk/blender/source/blender/makesrna/intern/makesrna.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/makesrna.c 2013-10-21 19:48:44 UTC (rev 60886)
+++ trunk/blender/source/blender/makesrna/intern/makesrna.c 2013-10-21 23:35:08 UTC (rev 60887)
@@ -3695,7 +3695,7 @@
" 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"
Modified: trunk/blender/source/blender/python/intern/bpy_app_ffmpeg.c
===================================================================
--- trunk/blender/source/blender/python/intern/bpy_app_ffmpeg.c 2013-10-21 19:48:44 UTC (rev 60886)
+++ trunk/blender/source/blender/python/intern/bpy_app_ffmpeg.c 2013-10-21 23:35:08 UTC (rev 60887)
@@ -89,7 +89,7 @@
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 @@
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
More information about the Bf-blender-cvs
mailing list