archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

style cleanup

Browse Source
This commit is contained in:
Campbell Barton
2013-10-21 23:35:08 +00:00
parent 4b0ff02aeb
commit 7c8c49a34a
10 changed files with 35 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/blenkernel/intern/editderivedmesh.c
View File

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

8
source/blender/bmesh/intern/bmesh_polygon.c
View 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. /* 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 */ * so swap data and delete the last created tri */
bmesh_face_swap_data(bm, f, f_new); 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) { if (nf_i < edge_array_len) {
r_faces_new[nf_i++] = f_a; r_faces_new[nf_i++] = f_a;
} else { }
else {
f_new = f_a; f_new = f_a;
break; break;
} }
@@ -990,7 +991,8 @@ void BM_face_triangulate(BMesh *bm, BMFace *f,
if (nf_i < edge_array_len) { if (nf_i < edge_array_len) {
r_faces_new[nf_i++] = f_b; r_faces_new[nf_i++] = f_b;
} else { }
else {
f_new = f_b; f_new = f_b;
break; break;
} }

6
source/blender/compositor/operations/COM_FastGaussianBlurOperation.cpp
View File

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

9
source/blender/editors/interface/interface.c
View File

@@ -3158,9 +3158,14 @@ uiBut *uiDefBut(uiBlock *block, int type, int retval, const char *str, int x, in
return but; 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. * 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) static int findBitIndex(unsigned int x)
{ {

3
source/blender/editors/screen/screen_ops.c
View File

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