diff options
Diffstat (limited to 'source/blender/blenkernel')
| -rw-r--r-- | source/blender/blenkernel/intern/cdderivedmesh.c | 2 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/editderivedmesh.c | 4 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/idprop.c | 3 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/image.c | 3 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/mesh.c | 5 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/subsurf_ccg.c | 4 |
6 files changed, 12 insertions, 9 deletions
diff --git a/source/blender/blenkernel/intern/cdderivedmesh.c b/source/blender/blenkernel/intern/cdderivedmesh.c index afbabd8d3e5..3450408a0a0 100644 --- a/source/blender/blenkernel/intern/cdderivedmesh.c +++ b/source/blender/blenkernel/intern/cdderivedmesh.c @@ -522,7 +522,7 @@ static void cdDM_drawFacesSolid(DerivedMesh *dm, glNormal3sv(no); \ } \ glVertex3fv(mvert[index].co); \ -} +} (void)0 if (cddm->pbvh && cddm->pbvh_draw) { if (dm->numTessFaceData) { diff --git a/source/blender/blenkernel/intern/editderivedmesh.c b/source/blender/blenkernel/intern/editderivedmesh.c index 9606abbd7c0..3e25281dd08 100644 --- a/source/blender/blenkernel/intern/editderivedmesh.c +++ b/source/blender/blenkernel/intern/editderivedmesh.c @@ -1012,7 +1012,7 @@ static void emDM_drawMappedFacesGLSL(DerivedMesh *dm, float *tang = attribs.tang.array[i * 4 + vert]; \ glVertexAttrib3fvARB(attribs.tang.gl_index, tang); \ } \ -} + } (void)0 for (i = 0, ltri = em->looptris[0]; i < em->tottri; i++, ltri += 3) { @@ -1141,7 +1141,7 @@ static void emDM_drawMappedFacesMat(DerivedMesh *dm, float *tang = attribs.tang.array[i * 4 + vert]; \ glVertexAttrib4fvARB(attribs.tang.gl_index, tang); \ } \ -} + } (void)0 for (i = 0, ltri = em->looptris[0]; i < em->tottri; i++, ltri += 3) { int drawSmooth; diff --git a/source/blender/blenkernel/intern/idprop.c b/source/blender/blenkernel/intern/idprop.c index e3735cfd374..42c7869a365 100644 --- a/source/blender/blenkernel/intern/idprop.c +++ b/source/blender/blenkernel/intern/idprop.c @@ -299,7 +299,8 @@ static IDProperty *IDP_CopyArray(IDProperty *prop) s_i = p_i[0]; p_i[0] = p_i[7]; p_i[7] = s_i; \ s_i = p_i[1]; p_i[1] = p_i[6]; p_i[6] = s_i; \ s_i = p_i[2]; p_i[2] = p_i[5]; p_i[5] = s_i; \ - s_i = p_i[3]; p_i[3] = p_i[4]; p_i[4] = s_i; } + s_i = p_i[3]; p_i[3] = p_i[4]; p_i[4] = s_i; \ + } (void)0 diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c index aff1e65224b..6ee15409857 100644 --- a/source/blender/blenkernel/intern/image.c +++ b/source/blender/blenkernel/intern/image.c @@ -2177,7 +2177,8 @@ static ImBuf *image_load_image_file(Image *ima, ImageUser *iuser, int cfra) flag = IB_rect | IB_multilayer; if (ima->flag & IMA_DO_PREMUL) flag |= IB_premul; - ibuf = IMB_ibImageFromMemory((unsigned char *)ima->packedfile->data, ima->packedfile->size, flag, "<packed data>"); + ibuf = IMB_ibImageFromMemory((unsigned char *)ima->packedfile->data, + ima->packedfile->size, flag, "<packed data>"); } else { flag = IB_rect | IB_multilayer | IB_metadata; diff --git a/source/blender/blenkernel/intern/mesh.c b/source/blender/blenkernel/intern/mesh.c index e3876f438f7..7a5c43b28f8 100644 --- a/source/blender/blenkernel/intern/mesh.c +++ b/source/blender/blenkernel/intern/mesh.c @@ -2092,8 +2092,9 @@ void BKE_mesh_convert_mfaces_to_mpolys(Mesh *mesh) mp->mat_nr = mf->mat_nr; mp->flag = mf->flag; -# define ML(v1, v2) {ml->v = mf->v1; ml->e = GET_INT_FROM_POINTER(BLI_edgehash_lookup(eh, mf->v1, mf->v2)); ml++; j++; \ -} +# define ML(v1, v2) { \ + ml->v = mf->v1; ml->e = GET_INT_FROM_POINTER(BLI_edgehash_lookup(eh, mf->v1, mf->v2)); ml++; j++; \ + } (void)0 ML(v1, v2); ML(v2, v3); diff --git a/source/blender/blenkernel/intern/subsurf_ccg.c b/source/blender/blenkernel/intern/subsurf_ccg.c index 19edcf6ac64..aec54ba827a 100644 --- a/source/blender/blenkernel/intern/subsurf_ccg.c +++ b/source/blender/blenkernel/intern/subsurf_ccg.c @@ -1816,7 +1816,7 @@ static void ccgDM_drawMappedFacesGLSL(DerivedMesh *dm, float *tang = attribs.tang.array[a * 4 + vert]; \ glVertexAttrib4fvARB(attribs.tang.gl_index, tang); \ } \ -} +} (void)0 totface = ccgSubSurf_getNumFaces(ss); for (a = 0, i = 0; i < totface; i++) { @@ -1972,7 +1972,7 @@ static void ccgDM_drawMappedFacesMat(DerivedMesh *dm, float *tang = attribs.tang.array[a * 4 + vert]; \ glVertexAttrib4fvARB(attribs.tang.gl_index, tang); \ } \ -} +} (void)0 totface = ccgSubSurf_getNumFaces(ss); for (a = 0, i = 0; i < totface; i++) { |