diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-12-22 07:11:10 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-12-22 07:12:19 +0400 |
| commit | c1c26c36f62c3bfdb40b01f33004695a09ce2f4d (patch) | |
| tree | 21e738fefe0c7d77af7c1129bcdfef65e1a8f655 /source | |
| parent | 5eb96d4705b93a7049ecabd0827e0e58b28a2838 (diff) | |
Style Cleanup: remove preprocessor indentation (updated wiki style guide too)
Diffstat (limited to 'source')
96 files changed, 344 insertions, 337 deletions
diff --git a/source/blender/blenkernel/intern/CCGSubSurf.c b/source/blender/blenkernel/intern/CCGSubSurf.c index ffb92788d4d..560bebd280b 100644 --- a/source/blender/blenkernel/intern/CCGSubSurf.c +++ b/source/blender/blenkernel/intern/CCGSubSurf.c @@ -1436,7 +1436,7 @@ static void ccgSubSurf__calcVertNormals(CCGSubSurf *ss, int normalDataOffset = ss->normalDataOffset; int vertDataSize = ss->meshIFC.vertDataSize; - #pragma omp parallel for private(ptrIdx) if (numEffectedF * edgeSize * edgeSize * 4 >= CCG_OMP_LIMIT) +#pragma omp parallel for private(ptrIdx) if (numEffectedF * edgeSize * edgeSize * 4 >= CCG_OMP_LIMIT) for (ptrIdx = 0; ptrIdx < numEffectedF; ptrIdx++) { CCGFace *f = (CCGFace *) effectedF[ptrIdx]; int S, x, y; @@ -1576,7 +1576,7 @@ static void ccgSubSurf__calcVertNormals(CCGSubSurf *ss, } } - #pragma omp parallel for private(ptrIdx) if (numEffectedF * edgeSize * edgeSize * 4 >= CCG_OMP_LIMIT) +#pragma omp parallel for private(ptrIdx) if (numEffectedF * edgeSize * edgeSize * 4 >= CCG_OMP_LIMIT) for (ptrIdx = 0; ptrIdx < numEffectedF; ptrIdx++) { CCGFace *f = (CCGFace *) effectedF[ptrIdx]; int S, x, y; @@ -1657,7 +1657,7 @@ static void ccgSubSurf__calcSubdivLevel(CCGSubSurf *ss, int vertDataSize = ss->meshIFC.vertDataSize; float *q = ss->q, *r = ss->r; - #pragma omp parallel for private(ptrIdx) if (numEffectedF * edgeSize * edgeSize * 4 >= CCG_OMP_LIMIT) +#pragma omp parallel for private(ptrIdx) if (numEffectedF * edgeSize * edgeSize * 4 >= CCG_OMP_LIMIT) for (ptrIdx = 0; ptrIdx < numEffectedF; ptrIdx++) { CCGFace *f = (CCGFace *) effectedF[ptrIdx]; int S, x, y; @@ -2004,17 +2004,17 @@ static void ccgSubSurf__calcSubdivLevel(CCGSubSurf *ss, } } - #pragma omp parallel private(ptrIdx) if (numEffectedF * edgeSize * edgeSize * 4 >= CCG_OMP_LIMIT) +#pragma omp parallel private(ptrIdx) if (numEffectedF * edgeSize * edgeSize * 4 >= CCG_OMP_LIMIT) { float *q, *r; - #pragma omp critical +#pragma omp critical { q = MEM_mallocN(ss->meshIFC.vertDataSize, "CCGSubsurf q"); r = MEM_mallocN(ss->meshIFC.vertDataSize, "CCGSubsurf r"); } - #pragma omp for schedule(static) +#pragma omp for schedule(static) for (ptrIdx = 0; ptrIdx < numEffectedF; ptrIdx++) { CCGFace *f = (CCGFace *) effectedF[ptrIdx]; int S, x, y; @@ -2105,7 +2105,7 @@ static void ccgSubSurf__calcSubdivLevel(CCGSubSurf *ss, } } - #pragma omp critical +#pragma omp critical { MEM_freeN(q); MEM_freeN(r); @@ -2117,14 +2117,14 @@ static void ccgSubSurf__calcSubdivLevel(CCGSubSurf *ss, gridSize = ccg_gridsize(nextLvl); cornerIdx = gridSize - 1; - #pragma omp parallel for private(i) if (numEffectedF * edgeSize * edgeSize * 4 >= CCG_OMP_LIMIT) +#pragma omp parallel for private(i) if (numEffectedF * edgeSize * edgeSize * 4 >= CCG_OMP_LIMIT) for (i = 0; i < numEffectedE; i++) { CCGEdge *e = effectedE[i]; VertDataCopy(EDGE_getCo(e, nextLvl, 0), VERT_getCo(e->v0, nextLvl), ss); VertDataCopy(EDGE_getCo(e, nextLvl, edgeSize - 1), VERT_getCo(e->v1, nextLvl), ss); } - #pragma omp parallel for private(i) if (numEffectedF * edgeSize * edgeSize * 4 >= CCG_OMP_LIMIT) +#pragma omp parallel for private(i) if (numEffectedF * edgeSize * edgeSize * 4 >= CCG_OMP_LIMIT) for (i = 0; i < numEffectedF; i++) { CCGFace *f = effectedF[i]; int S, x; diff --git a/source/blender/blenkernel/intern/cdderivedmesh.c b/source/blender/blenkernel/intern/cdderivedmesh.c index e95847b9de4..d9447e51aa3 100644 --- a/source/blender/blenkernel/intern/cdderivedmesh.c +++ b/source/blender/blenkernel/intern/cdderivedmesh.c @@ -2273,10 +2273,10 @@ void CDDM_calc_normals_mapping_ex(DerivedMesh *dm, const short only_face_normals * no need to duplicate verts. * WATCH THIS, bmesh only change!, * need to take care of the side effects here - campbell */ - #if 0 +#if 0 /* we don't want to overwrite any referenced layers */ cddm->mvert = CustomData_duplicate_referenced_layer(&dm->vertData, CD_MVERT, dm->numVertData); - #endif +#endif if (dm->numTessFaceData == 0) { diff --git a/source/blender/blenkernel/intern/dynamicpaint.c b/source/blender/blenkernel/intern/dynamicpaint.c index fe9a96d60cf..e2b752ea352 100644 --- a/source/blender/blenkernel/intern/dynamicpaint.c +++ b/source/blender/blenkernel/intern/dynamicpaint.c @@ -742,14 +742,14 @@ static void surfaceGenerateGrid(struct DynamicPaintSurface *surface) float min_dim; /* calculate canvas dimensions */ - #pragma omp parallel for schedule(static) +#pragma omp parallel for schedule(static) for (i = 0; i < sData->total_points; i++) { - #ifdef _OPENMP +#ifdef _OPENMP int id = omp_get_thread_num(); boundInsert(&grid_bounds[id], (bData->realCoord[bData->s_pos[i]].v)); - #else +#else boundInsert(&grid_bounds[0], (bData->realCoord[bData->s_pos[i]].v)); - #endif +#endif } /* get final dimensions */ @@ -802,7 +802,7 @@ static void surfaceGenerateGrid(struct DynamicPaintSurface *surface) if (!error) { /* calculate number of points withing each cell */ - #pragma omp parallel for schedule(static) +#pragma omp parallel for schedule(static) for (i = 0; i < sData->total_points; i++) { int co[3], j; for (j = 0; j < 3; j++) { @@ -811,11 +811,11 @@ static void surfaceGenerateGrid(struct DynamicPaintSurface *surface) } temp_t_index[i] = co[0] + co[1] * grid->dim[0] + co[2] * grid->dim[0] * grid->dim[1]; - #ifdef _OPENMP +#ifdef _OPENMP grid->s_num[temp_t_index[i] + omp_get_thread_num() * grid_cells]++; - #else +#else grid->s_num[temp_t_index[i]]++; - #endif +#endif } /* for first cell only calc s_num */ @@ -843,7 +843,7 @@ static void surfaceGenerateGrid(struct DynamicPaintSurface *surface) /* calculate cell bounds */ { int x; - #pragma omp parallel for schedule(static) +#pragma omp parallel for schedule(static) for (x = 0; x < grid->dim[0]; x++) { int y; for (y = 0; y < grid->dim[1]; y++) { @@ -1471,7 +1471,7 @@ static void dynamicPaint_setInitialColor(Scene *scene, DynamicPaintSurface *surf /* Single color */ else if (surface->init_color_type == MOD_DPAINT_INITIAL_COLOR) { /* apply color to every surface point */ - #pragma omp parallel for schedule(static) +#pragma omp parallel for schedule(static) for (i = 0; i < sData->total_points; i++) { copy_v3_v3(pPoint[i].color, surface->init_color); pPoint[i].alpha = surface->init_color[3]; @@ -1497,7 +1497,7 @@ static void dynamicPaint_setInitialColor(Scene *scene, DynamicPaintSurface *surf if (surface->format == MOD_DPAINT_SURFACE_F_VERTEX) { struct ImagePool *pool = BKE_image_pool_new(); - #pragma omp parallel for schedule(static) shared(pool) +#pragma omp parallel for schedule(static) shared(pool) for (i = 0; i < numOfFaces; i++) { int numOfVert = (mface[i].v4) ? 4 : 3; float uv[3] = {0.0f}; @@ -1524,7 +1524,7 @@ static void dynamicPaint_setInitialColor(Scene *scene, DynamicPaintSurface *surf ImgSeqFormatData *f_data = (ImgSeqFormatData *)sData->format_data; int samples = (surface->flags & MOD_DPAINT_ANTIALIAS) ? 5 : 1; - #pragma omp parallel for schedule(static) +#pragma omp parallel for schedule(static) for (i = 0; i < sData->total_points; i++) { float uv[9] = {0.0f}; float uv_final[3] = {0.0f}; @@ -1562,7 +1562,7 @@ static void dynamicPaint_setInitialColor(Scene *scene, DynamicPaintSurface *surf MCol *col = CustomData_get_layer_named(&dm->loopData, CD_MLOOPCOL, surface->init_layername); if (!col) return; - #pragma omp parallel for schedule(static) +#pragma omp parallel for schedule(static) for (i = 0; i < numOfLoops; i++) { pPoint[mloop[i].v].color[0] = 1.0f / 255.f * (float)col[i].b; pPoint[mloop[i].v].color[1] = 1.0f / 255.f * (float)col[i].g; @@ -1576,7 +1576,7 @@ static void dynamicPaint_setInitialColor(Scene *scene, DynamicPaintSurface *surf MCol *col = CustomData_get_layer_named(&dm->faceData, CD_MCOL, surface->init_layername); if (!col) return; - #pragma omp parallel for schedule(static) +#pragma omp parallel for schedule(static) for (i = 0; i < sData->total_points; i++) { int face_ind = f_data->uv_p[i].face_index; float colors[3][4] = {{0.0f, 0.0f, 0.0f, 0.0f}}; @@ -1680,7 +1680,7 @@ static void dynamicPaint_applySurfaceDisplace(DynamicPaintSurface *surface, Deri int i; float *value = (float *)sData->type_data; - #pragma omp parallel for schedule(static) +#pragma omp parallel for schedule(static) for (i = 0; i < sData->total_points; i++) { float normal[3], val = value[i] * surface->disp_factor; normal_short_to_float_v3(normal, mvert[i].no); @@ -1729,7 +1729,7 @@ static DerivedMesh *dynamicPaint_Modifier_apply(DynamicPaintModifierData *pmd, /* paint is stored on dry and wet layers, so mix final color first */ float *fcolor = MEM_callocN(sizeof(float) * sData->total_points * 4, "Temp paint color"); - #pragma omp parallel for schedule(static) +#pragma omp parallel for schedule(static) for (i = 0; i < sData->total_points; i++) { /* blend dry and wet layer */ blendColors(pPoint[i].color, pPoint[i].alpha, pPoint[i].e_color, pPoint[i].e_alpha, &fcolor[i * 4]); @@ -1757,7 +1757,7 @@ static DerivedMesh *dynamicPaint_Modifier_apply(DynamicPaintModifierData *pmd, NULL, totloop); if (col) { - #pragma omp parallel for schedule(static) +#pragma omp parallel for schedule(static) for (i = 0; i < totpoly; i++) { int j = 0; Material *material = give_current_material(ob, mp[i].mat_nr + 1); @@ -1808,7 +1808,7 @@ static DerivedMesh *dynamicPaint_Modifier_apply(DynamicPaintModifierData *pmd, col = CustomData_add_layer_named(&result->loopData, CD_MLOOPCOL, CD_CALLOC, NULL, totloop, surface->output_name); /* apply color */ if (col) { - #pragma omp parallel for schedule(static) +#pragma omp parallel for schedule(static) for (i = 0; i < totloop; i++) { int index = mloop[i].v * 4; rgb_float_to_uchar((unsigned char *)&col[i].r, &fcolor[index]); @@ -1825,7 +1825,7 @@ static DerivedMesh *dynamicPaint_Modifier_apply(DynamicPaintModifierData *pmd, col = CustomData_add_layer_named(&result->loopData, CD_MLOOPCOL, CD_CALLOC, NULL, totloop, surface->output_name2); /* apply color */ if (col) { - #pragma omp parallel for schedule(static) +#pragma omp parallel for schedule(static) for (i = 0; i < totloop; i++) { int index = mloop[i].v; col[i].r = @@ -1882,7 +1882,7 @@ static DerivedMesh *dynamicPaint_Modifier_apply(DynamicPaintModifierData *pmd, int i; PaintWavePoint *wPoint = (PaintWavePoint *)sData->type_data; - #pragma omp parallel for schedule(static) +#pragma omp parallel for schedule(static) for (i = 0; i < sData->total_points; i++) { float normal[3]; normal_short_to_float_v3(normal, mvert[i].no); @@ -2331,7 +2331,7 @@ int dynamicPaint_createUVSurface(Scene *scene, DynamicPaintSurface *surface) * if pixel is uv-mapped on a canvas face. */ if (!error) { - #pragma omp parallel for schedule(static) +#pragma omp parallel for schedule(static) for (ty = 0; ty < h; ty++) { int tx; for (tx = 0; tx < w; tx++) { @@ -2475,7 +2475,7 @@ int dynamicPaint_createUVSurface(Scene *scene, DynamicPaintSurface *surface) * If so use that polygon as pixel surface. * (To avoid seams on uv island edges) */ - #pragma omp parallel for schedule(static) +#pragma omp parallel for schedule(static) for (ty = 0; ty < h; ty++) { int tx; for (tx = 0; tx < w; tx++) { @@ -2666,7 +2666,7 @@ int dynamicPaint_createUVSurface(Scene *scene, DynamicPaintSurface *surface) /* ----------------------------------------------------------------- * For debug, output pixel statuses to the color map * -----------------------------------------------------------------*/ - #pragma omp parallel for schedule(static) +#pragma omp parallel for schedule(static) for (index = 0; index < sData->total_points; index++) { ImgSeqFormatData *f_data = (ImgSeqFormatData *)sData->format_data; @@ -2707,9 +2707,9 @@ void dynamicPaint_outputSurfaceImage(DynamicPaintSurface *surface, char *filenam return; } /* if selected format is openexr, but current build doesnt support one */ - #ifndef WITH_OPENEXR +#ifndef WITH_OPENEXR if (format == R_IMF_IMTYPE_OPENEXR) format = R_IMF_IMTYPE_PNG; - #endif +#endif BLI_strncpy(output_file, filename, sizeof(output_file)); BKE_add_image_extension_from_type(output_file, format); @@ -2724,7 +2724,7 @@ void dynamicPaint_outputSurfaceImage(DynamicPaintSurface *surface, char *filenam return; } - #pragma omp parallel for schedule(static) +#pragma omp parallel for schedule(static) for (index = 0; index < sData->total_points; index++) { int pos = f_data->uv_p[index].pixel_index * 4; /* image buffer position */ @@ -3220,7 +3220,7 @@ static void dynamicPaint_brushMeshCalculateVelocity(Scene *scene, Object *ob, Dy mvert_p = mvert_c; /* calculate speed */ - #pragma omp parallel for schedule(static) +#pragma omp parallel for schedule(static) for (i = 0; i < numOfVerts_c; i++) { float p1[3], p2[3]; @@ -3350,7 +3350,7 @@ static int dynamicPaint_paintMesh(DynamicPaintSurface *surface, continue; /* loop through cell points and process brush */ - #pragma omp parallel for schedule(static) +#pragma omp parallel for schedule(static) for (id = 0; id < grid->s_num[c_index]; id++) { int index = grid->t_index[grid->s_pos[c_index] + id]; int ss, samples = bData->s_num[index]; @@ -3755,7 +3755,7 @@ static int dynamicPaint_paintParticles(DynamicPaintSurface *surface, } /* loop through cell points */ - #pragma omp parallel for schedule(static) +#pragma omp parallel for schedule(static) for (id = 0; id < grid->s_num[c_index]; id++) { int index = grid->t_index[grid->s_pos[c_index] + id]; float disp_intersect = 0.0f; @@ -3929,7 +3929,7 @@ static int dynamicPaint_paintSinglePoint(DynamicPaintSurface *surface, float *po /* * Loop through every surface point */ - #pragma omp parallel for schedule(static) +#pragma omp parallel for schedule(static) for (index = 0; index < sData->total_points; index++) { float distance = len_v3v3(pointCoord, bData->realCoord[bData->s_pos[index]].v); float colorband[4] = {0.0f}; @@ -4043,7 +4043,7 @@ static void dynamicPaint_prepareAdjacencyData(DynamicPaintSurface *surface, int bNeighs = bData->bNeighs = MEM_mallocN(sData->adj_data->total_targets * sizeof(struct BakeAdjPoint), "PaintEffectBake"); if (!bNeighs) return; - #pragma omp parallel for schedule(static) +#pragma omp parallel for schedule(static) for (index = 0; index < sData->total_points; index++) { int i; int numOfNeighs = adj_data->n_num[index]; @@ -4231,7 +4231,7 @@ static int dynamicPaint_prepareEffectStep(DynamicPaintSurface *surface, Scene *s *force = MEM_mallocN(sData->total_points * 4 * sizeof(float), "PaintEffectForces"); if (*force) { - #pragma omp parallel for schedule(static) +#pragma omp parallel for schedule(static) for (index = 0; index < sData->total_points; index++) { float forc[3] = {0}; @@ -4320,7 +4320,7 @@ static void dynamicPaint_doEffectStep(DynamicPaintSurface *surface, float *force /* Copy current surface to the previous points array to read unmodified values */ memcpy(prevPoint, sData->type_data, sData->total_points * sizeof(struct PaintPoint)); - #pragma omp parallel for schedule(static) +#pragma omp parallel for schedule(static) for (index = 0; index < sData->total_points; index++) { int i; int numOfNeighs = sData->adj_data->n_num[index]; @@ -4362,7 +4362,7 @@ static void dynamicPaint_doEffectStep(DynamicPaintSurface *surface, float *force /* Copy current surface to the previous points array to read unmodified values */ memcpy(prevPoint, sData->type_data, sData->total_points * sizeof(struct PaintPoint)); - #pragma omp parallel for schedule(static) +#pragma omp parallel for schedule(static) for (index = 0; index < sData->total_points; index++) { int i; int numOfNeighs = sData->adj_data->n_num[index]; @@ -4507,7 +4507,7 @@ static void dynamicPaint_doWaveStep(DynamicPaintSurface *surface, float timescal /* copy previous frame data */ memcpy(prevPoint, sData->type_data, sData->total_points * sizeof(PaintWavePoint)); - #pragma omp parallel for schedule(static) +#pragma omp parallel for schedule(static) for (index = 0; index < sData->total_points; index++) { PaintWavePoint *wPoint = &((PaintWavePoint *)sData->type_data)[index]; int numOfNeighs = sData->adj_data->n_num[index]; @@ -4571,7 +4571,7 @@ static void dynamicPaint_doWaveStep(DynamicPaintSurface *surface, float timescal } /* reset state */ - #pragma omp parallel for schedule(static) +#pragma omp parallel for schedule(static) for (index = 0; index < sData->total_points; index++) { PaintWavePoint *wPoint = &((PaintWavePoint *)sData->type_data)[index]; /* if there wasnt any brush intersection, clear isect height */ @@ -4590,7 +4590,7 @@ static void dynamicPaint_surfacePreStep(DynamicPaintSurface *surface, float time PaintSurfaceData *sData = surface->data; int index; - #pragma omp parallel for schedule(static) +#pragma omp parallel for schedule(static) for (index = 0; index < sData->total_points; index++) { /* Do drying dissolve effects */ if (surface->type == MOD_DPAINT_SURFACE_T_PAINT) { @@ -4688,7 +4688,7 @@ static int dynamicPaint_surfaceHasMoved(DynamicPaintSurface *surface, Object *ob } /* vertices */ - #pragma omp parallel for schedule(static) +#pragma omp parallel for schedule(static) for (i = 0; i < numOfVerts; i++) { int j; for (j = 0; j < 3; j++) @@ -4806,7 +4806,7 @@ static int dynamicPaint_generateBakeData(DynamicPaintSurface *surface, Scene *sc /* * Prepare each surface point for a new step */ - #pragma omp parallel for schedule(static) +#pragma omp parallel for schedule(static) for (index = 0; index < sData->total_points; index++) { float prev_point[3] = {0.0f, 0.0f, 0.0f}; if (do_velocity_data && !new_bdata) { diff --git a/source/blender/blenkernel/intern/mask_rasterize.c b/source/blender/blenkernel/intern/mask_rasterize.c index 38301d51cbd..ce42d6abc33 100644 --- a/source/blender/blenkernel/intern/mask_rasterize.c +++ b/source/blender/blenkernel/intern/mask_rasterize.c @@ -746,10 +746,10 @@ void BKE_maskrasterize_handle_init(MaskRasterHandle *mr_handle, struct Mask *mas sf_vert = BLI_scanfill_vert_add(&sf_ctx, co_feather); /* no need for these attrs */ - #if 0 +#if 0 sf_vert->tmp.u = sf_vert_tot; sf_vert->keyindex = sf_vert_tot + tot_diff_point; /* absolute index of feather vert */ - #endif +#endif sf_vert->keyindex = SF_KEYINDEX_TEMP_ID; sf_vert_tot++; } diff --git a/source/blender/blenkernel/intern/multires.c b/source/blender/blenkernel/intern/multires.c index 81708133bf3..722ea536ed2 100644 --- a/source/blender/blenkernel/intern/multires.c +++ b/source/blender/blenkernel/intern/multires.c @@ -1049,7 +1049,7 @@ static void multiresModifier_disp_run(DerivedMesh *dm, Mesh *me, DerivedMesh *dm k = 0; /*current loop/mdisp index within the mloop array*/ - #pragma omp parallel for private(i) if (totloop * gridSize * gridSize >= CCG_OMP_LIMIT) +#pragma omp parallel for private(i) if (totloop * gridSize * gridSize >= CCG_OMP_LIMIT) for (i = 0; i < totpoly; ++i) { const int numVerts = mpoly[i].totloop; @@ -1064,7 +1064,7 @@ static void multiresModifier_disp_run(DerivedMesh *dm, Mesh *me, DerivedMesh *dm /* when adding new faces in edit mode, need to allocate disps */ if (!mdisp->disps) - #pragma omp critical +#pragma omp critical { multires_reallocate_mdisps(totloop, mdisps, totlvl); } @@ -1074,7 +1074,7 @@ static void multiresModifier_disp_run(DerivedMesh *dm, Mesh *me, DerivedMesh *dm /* if needed, reallocate multires paint mask */ if (gpm && gpm->level < key.level) { gpm->level = key.level; - #pragma omp critical +#pragma omp critical { if (gpm->data) MEM_freeN(gpm->data); @@ -2209,7 +2209,7 @@ static void multires_apply_smat(Scene *scene, Object *ob, float smat[3][3]) dGridSize = multires_side_tot[high_mmd.totlvl]; dSkip = (dGridSize - 1) / (gridSize - 1); - #pragma omp parallel for private(i) if (me->totface * gridSize * gridSize * 4 >= CCG_OMP_LIMIT) +#pragma omp parallel for private(i) if (me->totface * gridSize * gridSize * 4 >= CCG_OMP_LIMIT) for (i = 0; i < me->totpoly; ++i) { const int numVerts = mpoly[i].totloop; MDisps *mdisp = &mdisps[mpoly[i].loopstart]; diff --git a/source/blender/blenkernel/intern/node.c b/source/blender/blenkernel/intern/node.c index 85354e4e0d7..d0ce56332a7 100644 --- a/source/blender/blenkernel/intern/node.c +++ b/source/blender/blenkernel/intern/node.c @@ -3136,7 +3136,7 @@ void node_type_base(bNodeType *ntype, int type, const char *name, short nclass, * created in makesrna, which can not be associated to a bNodeType immediately, * since bNodeTypes are registered afterward ... */ - #define DefNode(Category, ID, DefFunc, EnumName, StructName, UIName, UIDesc) \ +#define DefNode(Category, ID, DefFunc, EnumName, StructName, UIName, UIDesc) \ case ID: \ BLI_strncpy(ntype->idname, #Category #StructName, sizeof(ntype->idname)); \ ntype->ext.srna = RNA_struct_find(#Category #StructName); \ @@ -3145,7 +3145,7 @@ void node_type_base(bNodeType *ntype, int type, const char *name, short nclass, break; switch (type) { - #include "NOD_static_types.h" +#include "NOD_static_types.h" } /* make sure we have a valid type (everything registered) */ diff --git a/source/blender/blenkernel/intern/particle_system.c b/source/blender/blenkernel/intern/particle_system.c index 41217110cd8..0f5707f9a60 100644 --- a/source/blender/blenkernel/intern/particle_system.c +++ b/source/blender/blenkernel/intern/particle_system.c @@ -2704,7 +2704,7 @@ static void sph_force_cb(void *sphdata_v, ParticleKey *state, float *force, floa temp_spring.delete_flag = 0; /* sph_spring_add is not thread-safe. - z0r */ - #pragma omp critical +#pragma omp critical sph_spring_add(psys[0], &temp_spring); } } @@ -4378,7 +4378,7 @@ static void dynamics_step(ParticleSimulationData *sim, float cfra) if (part->fluid->solver == SPH_SOLVER_DDR) { /* Apply SPH forces using double-density relaxation algorithm * (Clavat et. al.) */ - #pragma omp parallel for firstprivate (sphdata) private (pa) schedule(dynamic,5) +#pragma omp parallel for firstprivate (sphdata) private (pa) schedule(dynamic,5) LOOP_DYNAMIC_PARTICLES { /* do global forces & effectors */ basic_integrate(sim, p, pa->state.time, cfra); @@ -4393,7 +4393,7 @@ static void dynamics_step(ParticleSimulationData *sim, float cfra) * particles, thus rotation has not a direct sense for them */ basic_rotate(part, pa, pa->state.time, timestep); - #pragma omp critical +#pragma omp critical if (part->time_flag & PART_TIME_AUTOSF) update_courant_num(sim, pa, dtime, &sphdata); } @@ -4407,19 +4407,19 @@ static void dynamics_step(ParticleSimulationData *sim, float cfra) * and Monaghan). Note that, unlike double-density relaxation, * this algorithm is separated into distinct loops. */ - #pragma omp parallel for firstprivate (sphdata) private (pa) schedule(dynamic,5) +#pragma omp parallel for firstprivate (sphdata) private (pa) schedule(dynamic,5) LOOP_DYNAMIC_PARTICLES { basic_integrate(sim, p, pa->state.time, cfra); } /* calculate summation density */ - #pragma omp parallel for firstprivate (sphdata) private (pa) schedule(dynamic,5) +#pragma omp parallel for firstprivate (sphdata) private (pa) schedule(dynamic,5) LOOP_DYNAMIC_PARTICLES { sphclassical_calc_dens(pa, pa->state.time, &sphdata); } /* do global forces & effectors */ - #pragma omp parallel for firstprivate (sphdata) private (pa) schedule(dynamic,5) +#pragma omp parallel for firstprivate (sphdata) private (pa) schedule(dynamic,5) LOOP_DYNAMIC_PARTICLES { /* actual fluids calculations */ sph_integrate(sim, pa, pa->state.time, &sphdata); @@ -4431,7 +4431,7 @@ static void dynamics_step(ParticleSimulationData *sim, float cfra) * particles, thus rotation has not a direct sense for them */ basic_rotate(part, pa, pa->state.time, timestep); - #pragma omp critical +#pragma omp critical if (part->time_flag & PART_TIME_AUTOSF) update_courant_num(sim, pa, dtime, &sphdata); } @@ -4526,7 +4526,7 @@ static void particles_fluid_step(ParticleSimulationData *sim, int UNUSED(cfra)) } /* fluid sim particle import handling, actual loading of particles from file */ - #ifdef WITH_MOD_FLUID +#ifdef WITH_MOD_FLUID { FluidsimModifierData *fluidmd = (FluidsimModifierData *)modifiers_findByType(sim->ob, eModifierType_Fluidsim); @@ -4620,7 +4620,7 @@ static void particles_fluid_step(ParticleSimulationData *sim, int UNUSED(cfra)) } // fluid sim particles done } - #endif // WITH_MOD_FLUID +#endif // WITH_MOD_FLUID } static int emit_particles(ParticleSimulationData *sim, PTCacheID *pid, float UNUSED(cfra)) diff --git a/source/blender/blenkernel/intern/pbvh.c b/source/blender/blenkernel/intern/pbvh.c index 061a54da96f..27e52614a40 100644 --- a/source/blender/blenkernel/intern/pbvh.c +++ b/source/blender/blenkernel/intern/pbvh.c @@ -936,7 +936,7 @@ static void pbvh_update_normals(PBVH *bvh, PBVHNode **nodes, * can only update vertices marked with ME_VERT_PBVH_UPDATE. */ - #pragma omp parallel for private(n) schedule(static) +#pragma omp parallel for private(n) schedule(static) for (n = 0; n < totnode; n++) { PBVHNode *node = nodes[n]; @@ -965,11 +965,11 @@ static void pbvh_update_normals(PBVH *bvh, PBVHNode **nodes, if (bvh->verts[v].flag & ME_VERT_PBVH_UPDATE) { /* this seems like it could be very slow but profile * does not show this, so just leave it for now? */ - #pragma omp atomic +#pragma omp atomic vnor[v][0] += fn[0]; - #pragma omp atomic +#pragma omp atomic vnor[v][1] += fn[1]; - #pragma omp atomic +#pragma omp atomic vnor[v][2] += fn[2]; } } @@ -980,7 +980,7 @@ static void pbvh_update_normals(PBVH *bvh, PBVHNode **nodes, } } - #pragma omp parallel for private(n) schedule(static) +#pragma omp parallel for private(n) schedule(static) for (n = 0; n < totnode; n++) { PBVHNode *node = nodes[n]; @@ -1017,7 +1017,7 @@ void pbvh_update_BB_redraw(PBVH *bvh, PBVHNode **nodes, int totnode, int flag) int n; /* update BB, redraw flag */ - #pragma omp parallel for private(n) schedule(static) +#pragma omp parallel for private(n) schedule(static) for (n = 0; n < totnode; n++) { PBVHNode *node = nodes[n]; @@ -1816,7 +1816,7 @@ PBVHProxyNode *BKE_pbvh_node_add_proxy(PBVH *bvh, PBVHNode *node) { int index, totverts; - #pragma omp critical +#pragma omp critical { index = node->proxy_count; @@ -1837,7 +1837,7 @@ PBVHProxyNode *BKE_pbvh_node_add_proxy(PBVH *bvh, PBVHNode *node) void BKE_pbvh_node_free_proxies(PBVHNode *node) { - #pragma omp critical +#pragma omp critical { int p; diff --git a/source/blender/blenkernel/intern/pbvh_bmesh.c b/source/blender/blenkernel/intern/pbvh_bmesh.c index 0a7c6d901af..296f931e2fb 100644 --- a/source/blender/blenkernel/intern/pbvh_bmesh.c +++ b/source/blender/blenkernel/intern/pbvh_bmesh.c @@ -1496,7 +1496,7 @@ void pbvh_bmesh_verify(PBVH *bvh) } BLI_assert(found); - #if 1 +#if 1 /* total freak stuff, check if node exists somewhere else */ /* Slow */ for (i = 0; i < bvh->totnode; i++) { @@ -1505,10 +1505,10 @@ void pbvh_bmesh_verify(PBVH *bvh) BLI_assert(!BLI_gset_haskey(n->bm_unique_verts, v)); } - #endif +#endif } - #if 0 +#if 0 /* check that every vert belongs somewhere */ /* Slow */ BM_ITER_MESH (vi, &iter, bvh->bm, BM_VERTS_OF_MESH) { @@ -1524,7 +1524,7 @@ void pbvh_bmesh_verify(PBVH *bvh) /* if totvert differs from number of verts inside the hash. hash-totvert is checked above */ BLI_assert(vert_count == bvh->bm->totvert); - #endif +#endif /* Check that node elements are recorded in the top level */ for (i = 0; i < bvh->totnode; i++) { @@ -1532,11 +1532,11 @@ void pbvh_bmesh_verify(PBVH *bvh) if (n->flag & PBVH_Leaf) { /* Check for duplicate entries */ /* Slow */ - #if 0 +#if 0 bli_ghash_duplicate_key_check(n->bm_faces); bli_gset_duplicate_key_check(n->bm_unique_verts); bli_gset_duplicate_key_check(n->bm_other_verts); - #endif +#endif GHASH_ITER (gh_iter, n->bm_faces) { BMFace *f = BLI_ghashIterator_getKey(&gh_iter); diff --git a/source/blender/blenkernel/intern/smoke.c b/source/blender/blenkernel/intern/smoke.c index b39f31bd1ec..bd9d20333e5 100644 --- a/source/blender/blenkernel/intern/smoke.c +++ b/source/blender/blenkernel/intern/smoke.c @@ -785,7 +785,7 @@ static void obstacles_from_derivedmesh(Object *coll_ob, SmokeDomainSettings *sds } if (bvhtree_from_mesh_faces(&treeData, dm, 0.0f, 4, 6)) { - #pragma omp parallel for schedule(static) +#pragma omp parallel for schedule(static) for (z = sds->res_min[2]; z < sds->res_max[2]; z++) { int x, y; for (x = sds->res_min[0]; x < sds->res_max[0]; x++) @@ -1352,7 +1352,7 @@ static void emit_from_particles(Object *flow_ob, SmokeDomainSettings *sds, Smoke /* begin thread safe malloc */ BLI_begin_threaded_malloc(); - #pragma omp parallel for schedule(static) +#pragma omp parallel for schedule(static) for (z = min[2]; z < max[2]; z++) { int x, y; for (x = min[0]; x < max[0]; x++) @@ -1632,7 +1632,7 @@ static void emit_from_derivedmesh(Object *flow_ob, SmokeDomainSettings *sds, Smo } if (bvhtree_from_mesh_faces(&treeData, dm, 0.0f, 4, 6)) { - #pragma omp parallel for schedule(static) +#pragma omp parallel for schedule(static) for (z = min[2]; z < max[2]; z++) { int x, y; for (x = min[0]; x < max[0]; x++) @@ -2377,7 +2377,7 @@ static void update_effectors(Scene *scene, Object *ob, SmokeDomainSettings *sds, int x; // precalculate wind forces - #pragma omp parallel for schedule(static) +#pragma omp parallel for schedule(static) for (x = 0; x < sds->res[0]; x++) { int y, z; diff --git a/source/blender/blenkernel/intern/tracking.c b/source/blender/blenkernel/intern/tracking.c index 355922d157a..e07d84a99ce 100644 --- a/source/blender/blenkernel/intern/tracking.c +++ b/source/blender/blenkernel/intern/tracking.c @@ -3064,7 +3064,7 @@ bool BKE_tracking_context_step(MovieTrackingContext *context) frame_width = destination_ibuf->x; frame_height = destination_ibuf->y; - #pragma omp parallel for private(a) shared(destination_ibuf, ok) if (map_size > 1) +#pragma omp parallel for private(a) shared(destination_ibuf, ok) if (map_size > 1) for (a = 0; a < map_size; a++) { TrackContext *track_context = NULL; MovieTrackingTrack *track; @@ -3103,7 +3103,7 @@ bool BKE_tracking_context_step(MovieTrackingContext *context) dst_pixel_x, dst_pixel_y); } - #pragma omp critical +#pragma omp critical { tracking_insert_new_marker(context, track, marker, curfra, tracked, frame_width, frame_height, dst_pixel_x, dst_pixel_y); @@ -4468,7 +4468,7 @@ ImBuf *BKE_tracking_stabilize_frame(MovieTracking *tracking, int framenr, ImBuf * But need to keep an eye on this if the function will be * used in other cases. */ - #pragma omp parallel for if (tmpibuf->y > 128) +#pragma omp parallel for if (tmpibuf->y > 128) for (j = 0; j < tmpibuf->y; j++) { int i; for (i = 0; i < tmpibuf->x; i++) { diff --git a/source/blender/blenlib/intern/path_util.c b/source/blender/blenlib/intern/path_util.c index a753975ef7c..422440d8b09 100644 --- a/source/blender/blenlib/intern/path_util.c +++ b/source/blender/blenlib/intern/path_util.c @@ -268,7 +268,7 @@ bool BLI_uniquename_cb(bool (*unique_check)(void *arg, const char *name), /* little helper macro for BLI_uniquename */ #ifndef GIVE_STRADDR - #define GIVE_STRADDR(data, offset) ( ((char *)data) + offset) +# define GIVE_STRADDR(data, offset) ( ((char *)data) + offset) #endif /* Generic function to set a unique name. It is only designed to be used in situations diff --git a/source/blender/blenlib/intern/storage.c b/source/blender/blenlib/intern/storage.c index e40527b1bb6..c0d09b2d33c 100644 --- a/source/blender/blenlib/intern/storage.c +++ b/source/blender/blenlib/intern/storage.c @@ -522,11 +522,11 @@ int BLI_stat(const char *path, struct stat *buffer) UTF16_ENCODE(path); /* workaround error in MinGW64 headers, normally, a wstat should work */ - #ifndef __MINGW64__ +#ifndef __MINGW64__ r = _wstat(path_16, buffer); - #else +#else r = _wstati64(path_16, buffer); - #endif +#endif UTF16_UN_ENCODE(path); return r; diff --git a/source/blender/blenloader/intern/versioning_260.c b/source/blender/blenloader/intern/versioning_260.c index 5acf6319d2f..d63b72bc4c1 100644 --- a/source/blender/blenloader/intern/versioning_260.c +++ b/source/blender/blenloader/intern/versioning_260.c @@ -485,7 +485,7 @@ static void do_versions_affine_tracker_track(MovieTrackingTrack *track) static const char *node_get_static_idname(int type, int treetype) { /* use static type info header to map static int type to identifier string */ - #define DefNode(Category, ID, DefFunc, EnumName, StructName, UIName, UIDesc) \ +#define DefNode(Category, ID, DefFunc, EnumName, StructName, UIName, UIDesc) \ case ID: return #Category #StructName; /* XXX hack, group types share a single static integer identifier, but are registered as separate types */ @@ -498,7 +498,7 @@ static const char *node_get_static_idname(int type, int treetype) } else { switch (type) { - #include "NOD_static_types.h" +#include "NOD_static_types.h" } } return ""; @@ -2108,14 +2108,14 @@ void blo_do_versions_260(FileData *fd, Library *UNUSED(lib), Main *main) if (!MAIN_VERSION_ATLEAST(main, 266, 6)) { Brush *brush; - #define BRUSH_TEXTURE_OVERLAY (1 << 21) +#define BRUSH_TEXTURE_OVERLAY (1 << 21) for (brush = main->brush.first; brush; brush = brush->id.next) { brush->overlay_flags = 0; if (brush->flag & BRUSH_TEXTURE_OVERLAY) brush->overlay_flags |= (BRUSH_OVERLAY_PRIMARY | BRUSH_OVERLAY_CURSOR); } - #undef BRUSH_TEXTURE_OVERLAY +#undef BRUSH_TEXTURE_OVERLAY } if (main->versionfile < 267) { @@ -2271,7 +2271,7 @@ void blo_do_versions_260(FileData *fd, Library *UNUSED(lib), Main *main) if (!MAIN_VERSION_ATLEAST(main, 268, 2)) { Brush *brush; - #define BRUSH_FIXED (1 << 6) +#define BRUSH_FIXED (1 << 6) for (brush = main->brush.first; brush; brush = brush->id.next) { brush->flag &= ~BRUSH_FIXED; @@ -2282,7 +2282,7 @@ void blo_do_versions_260(FileData *fd, Library *UNUSED(lib), Main *main) if (brush->mask_overlay_alpha < 2) brush->mask_overlay_alpha = 33; } - #undef BRUSH_FIXED +#undef BRUSH_FIXED } diff --git a/source/blender/compositor/intern/COM_MemoryBuffer.h b/source/blender/compositor/intern/COM_MemoryBuffer.h index f9cde79c07f..521e3c6231e 100644 --- a/source/blender/compositor/intern/COM_MemoryBuffer.h +++ b/source/blender/compositor/intern/COM_MemoryBuffer.h @@ -29,8 +29,8 @@ class MemoryBuffer; #include "COM_MemoryProxy.h" extern "C" { - #include "BLI_math.h" - #include "BLI_rect.h" +# include "BLI_math.h" +# include "BLI_rect.h" } /** diff --git a/source/blender/compositor/intern/COM_WorkScheduler.h b/source/blender/compositor/intern/COM_WorkScheduler.h index 78bba1e3074..71c5f859418 100644 --- a/source/blender/compositor/intern/COM_WorkScheduler.h +++ b/source/blender/compositor/intern/COM_WorkScheduler.h @@ -25,7 +25,7 @@ #include "COM_ExecutionGroup.h" extern "C" { - #include "BLI_threads.h" +# include "BLI_threads.h" } #include "COM_WorkPackage.h" #include "COM_defines.h" diff --git a/source/blender/compositor/nodes/COM_ImageNode.cpp b/source/blender/compositor/nodes/COM_ImageNode.cpp index d595afe6a78..5571a186333 100644 --- a/source/blender/compositor/nodes/COM_ImageNode.cpp +++ b/source/blender/compositor/nodes/COM_ImageNode.cpp @@ -96,11 +96,11 @@ void ImageNode::convertToOperations(ExecutionSystem *graph, CompositorContext *c /* Passes in the file can differ from passes stored in sockets (#36755). * Look up the correct file pass using the socket identifier instead. */ - #if 0 +#if 0 NodeImageLayer *storage = (NodeImageLayer *)bnodeSocket->storage;*/ int passindex = storage->pass_index;*/ RenderPass *rpass = (RenderPass *)BLI_findlink(&rl->passes, passindex); - #endif +#endif int passindex; RenderPass *rpass; for (rpass = (RenderPass *)rl->passes.first, passindex = 0; rpass; rpass = rpass->next, ++passindex) diff --git a/source/blender/compositor/nodes/COM_ImageNode.h b/source/blender/compositor/nodes/COM_ImageNode.h index 12b4da6c8b3..c8d53b405a0 100644 --- a/source/blender/compositor/nodes/COM_ImageNode.h +++ b/source/blender/compositor/nodes/COM_ImageNode.h @@ -26,7 +26,7 @@ #include "DNA_node_types.h" #include "DNA_image_types.h" extern "C" { - #include "RE_engine.h" +# include "RE_engine.h" } /** diff --git a/source/blender/compositor/nodes/COM_KeyingScreenNode.cpp b/source/blender/compositor/nodes/COM_KeyingScreenNode.cpp index cd1f79235ea..59d889d0c84 100644 --- a/source/blender/compositor/nodes/COM_KeyingScreenNode.cpp +++ b/source/blender/compositor/nodes/COM_KeyingScreenNode.cpp @@ -26,7 +26,7 @@ #include "COM_KeyingScreenOperation.h" extern "C" { - #include "DNA_movieclip_types.h" +# include "DNA_movieclip_types.h" } KeyingScreenNode::KeyingScreenNode(bNode *editorNode) : Node(editorNode) diff --git a/source/blender/compositor/nodes/COM_MaskNode.cpp b/source/blender/compositor/nodes/COM_MaskNode.cpp index 8d549d09362..65ff443b55b 100644 --- a/source/blender/compositor/nodes/COM_MaskNode.cpp +++ b/source/blender/compositor/nodes/COM_MaskNode.cpp @@ -26,7 +26,7 @@ #include "COM_MaskOperation.h" extern "C" { - #include "DNA_mask_types.h" +# include "DNA_mask_types.h" } MaskNode::MaskNode(bNode *editorNode) : Node(editorNode) diff --git a/source/blender/compositor/nodes/COM_MovieClipNode.cpp b/source/blender/compositor/nodes/COM_MovieClipNode.cpp index 10dd72ec7bf..041fa9f7c4c 100644 --- a/source/blender/compositor/nodes/COM_MovieClipNode.cpp +++ b/source/blender/compositor/nodes/COM_MovieClipNode.cpp @@ -27,10 +27,10 @@ #include "COM_ConvertColorProfileOperation.h" extern "C" { - #include "DNA_movieclip_types.h" - #include "BKE_movieclip.h" - #include "BKE_tracking.h" - #include "IMB_imbuf.h" +# include "DNA_movieclip_types.h" +# include "BKE_movieclip.h" +# include "BKE_tracking.h" +# include "IMB_imbuf.h" } MovieClipNode::MovieClipNode(bNode *editorNode) : Node(editorNode) diff --git a/source/blender/compositor/nodes/COM_MuteNode.cpp b/source/blender/compositor/nodes/COM_MuteNode.cpp index de12fff3591..5155b55a2ec 100644 --- a/source/blender/compositor/nodes/COM_MuteNode.cpp +++ b/source/blender/compositor/nodes/COM_MuteNode.cpp @@ -27,7 +27,7 @@ #include "COM_SetColorOperation.h" extern "C" { - #include "BLI_listbase.h" +# include "BLI_listbase.h" } MuteNode::MuteNode(bNode *editorNode) : Node(editorNode) diff --git a/source/blender/compositor/nodes/COM_MuteNode.h b/source/blender/compositor/nodes/COM_MuteNode.h index 2e5250e625e..7b0f1c2c298 100644 --- a/source/blender/compositor/nodes/COM_MuteNode.h +++ b/source/blender/compositor/nodes/COM_MuteNode.h @@ -28,7 +28,7 @@ #include "COM_Node.h" extern "C" { - #include "BKE_node.h" +# include "BKE_node.h" } /** diff --git a/source/blender/compositor/nodes/COM_PlaneTrackDeformNode.cpp b/source/blender/compositor/nodes/COM_PlaneTrackDeformNode.cpp index d6434c26c7d..f52c696b772 100644 --- a/source/blender/compositor/nodes/COM_PlaneTrackDeformNode.cpp +++ b/source/blender/compositor/nodes/COM_PlaneTrackDeformNode.cpp @@ -28,9 +28,9 @@ #include "COM_PlaneTrackWarpImageOperation.h" extern "C" { - #include "BKE_node.h" - #include "BKE_movieclip.h" - #include "BKE_tracking.h" +# include "BKE_node.h" +# include "BKE_movieclip.h" +# include "BKE_tracking.h" } PlaneTrackDeformNode::PlaneTrackDeformNode(bNode *editorNode) : Node(editorNode) diff --git a/source/blender/compositor/nodes/COM_PlaneTrackDeformNode.h b/source/blender/compositor/nodes/COM_PlaneTrackDeformNode.h index cf173cd19f9..3c37f4474dd 100644 --- a/source/blender/compositor/nodes/COM_PlaneTrackDeformNode.h +++ b/source/blender/compositor/nodes/COM_PlaneTrackDeformNode.h @@ -23,8 +23,8 @@ #include "DNA_node_types.h" extern "C" { - #include "DNA_movieclip_types.h" - #include "DNA_node_types.h" +# include "DNA_movieclip_types.h" +# include "DNA_node_types.h" } /** diff --git a/source/blender/compositor/nodes/COM_Stabilize2dNode.cpp b/source/blender/compositor/nodes/COM_Stabilize2dNode.cpp index a579503a829..8f17c4d9345 100644 --- a/source/blender/compositor/nodes/COM_Stabilize2dNode.cpp +++ b/source/blender/compositor/nodes/COM_Stabilize2dNode.cpp @@ -29,8 +29,8 @@ #include "COM_SetSamplerOperation.h" extern "C" { - #include "DNA_movieclip_types.h" - #include "BKE_tracking.h" +# include "DNA_movieclip_types.h" +# include "BKE_tracking.h" } Stabilize2dNode::Stabilize2dNode(bNode *editorNode) : Node(editorNode) diff --git a/source/blender/compositor/nodes/COM_TimeNode.cpp b/source/blender/compositor/nodes/COM_TimeNode.cpp index 00ca797bd9b..83f99a16d9f 100644 --- a/source/blender/compositor/nodes/COM_TimeNode.cpp +++ b/source/blender/compositor/nodes/COM_TimeNode.cpp @@ -24,7 +24,7 @@ #include "COM_SetValueOperation.h" #include "COM_ExecutionSystem.h" extern "C" { - #include "BKE_colortools.h" +# include "BKE_colortools.h" } #include "BLI_utildefines.h" diff --git a/source/blender/compositor/nodes/COM_TrackPositionNode.cpp b/source/blender/compositor/nodes/COM_TrackPositionNode.cpp index c5474e0ce70..bb8cecc60ad 100644 --- a/source/blender/compositor/nodes/COM_TrackPositionNode.cpp +++ b/source/blender/compositor/nodes/COM_TrackPositionNode.cpp @@ -26,9 +26,9 @@ #include "COM_TrackPositionOperation.h" extern "C" { - #include "DNA_movieclip_types.h" +# include "DNA_movieclip_types.h" - #include "BKE_node.h" +# include "BKE_node.h" } TrackPositionNode::TrackPositionNode(bNode *editorNode) : Node(editorNode) diff --git a/source/blender/compositor/operations/COM_AntiAliasOperation.cpp b/source/blender/compositor/operations/COM_AntiAliasOperation.cpp index 867053bf1d2..995c61589cc 100644 --- a/source/blender/compositor/operations/COM_AntiAliasOperation.cpp +++ b/source/blender/compositor/operations/COM_AntiAliasOperation.cpp @@ -27,7 +27,7 @@ #include "MEM_guardedalloc.h" extern "C" { - #include "RE_render_ext.h" +# include "RE_render_ext.h" } diff --git a/source/blender/compositor/operations/COM_BilateralBlurOperation.cpp b/source/blender/compositor/operations/COM_BilateralBlurOperation.cpp index 5f5eca96378..2527f13c3ed 100644 --- a/source/blender/compositor/operations/COM_BilateralBlurOperation.cpp +++ b/source/blender/compositor/operations/COM_BilateralBlurOperation.cpp @@ -24,7 +24,7 @@ #include "BLI_math.h" extern "C" { - #include "RE_pipeline.h" +# include "RE_pipeline.h" } BilateralBlurOperation::BilateralBlurOperation() : NodeOperation() diff --git a/source/blender/compositor/operations/COM_BlurBaseOperation.cpp b/source/blender/compositor/operations/COM_BlurBaseOperation.cpp index dfff2bfeafb..c8d53b6992d 100644 --- a/source/blender/compositor/operations/COM_BlurBaseOperation.cpp +++ b/source/blender/compositor/operations/COM_BlurBaseOperation.cpp @@ -25,7 +25,7 @@ #include "MEM_guardedalloc.h" extern "C" { - #include "RE_pipeline.h" +# include "RE_pipeline.h" } BlurBaseOperation::BlurBaseOperation(DataType data_type) : NodeOperation() diff --git a/source/blender/compositor/operations/COM_BokehBlurOperation.cpp b/source/blender/compositor/operations/COM_BokehBlurOperation.cpp index 7f17db1d31b..f5bca5371e6 100644 --- a/source/blender/compositor/operations/COM_BokehBlurOperation.cpp +++ b/source/blender/compositor/operations/COM_BokehBlurOperation.cpp @@ -25,7 +25,7 @@ #include "COM_OpenCLDevice.h" extern "C" { - #include "RE_pipeline.h" +# include "RE_pipeline.h" } BokehBlurOperation::BokehBlurOperation() : NodeOperation() diff --git a/source/blender/compositor/operations/COM_ColorCurveOperation.cpp b/source/blender/compositor/operations/COM_ColorCurveOperation.cpp index 1115b2ab239..19deb2f2ba0 100644 --- a/source/blender/compositor/operations/COM_ColorCurveOperation.cpp +++ b/source/blender/compositor/operations/COM_ColorCurveOperation.cpp @@ -25,7 +25,7 @@ #ifdef __cplusplus extern "C" { #endif - #include "BKE_colortools.h" +# include "BKE_colortools.h" #ifdef __cplusplus } #include "MEM_guardedalloc.h" diff --git a/source/blender/compositor/operations/COM_ColorRampOperation.cpp b/source/blender/compositor/operations/COM_ColorRampOperation.cpp index fd3380d594e..84d36034ec6 100644 --- a/source/blender/compositor/operations/COM_ColorRampOperation.cpp +++ b/source/blender/compositor/operations/COM_ColorRampOperation.cpp @@ -25,7 +25,7 @@ #ifdef __cplusplus extern "C" { #endif - #include "BKE_texture.h" +# include "BKE_texture.h" #ifdef __cplusplus } #endif diff --git a/source/blender/compositor/operations/COM_CompositorOperation.cpp b/source/blender/compositor/operations/COM_CompositorOperation.cpp index 3d4b771fecc..d4629a8d527 100644 --- a/source/blender/compositor/operations/COM_CompositorOperation.cpp +++ b/source/blender/compositor/operations/COM_CompositorOperation.cpp @@ -26,12 +26,12 @@ #include "BKE_image.h" extern "C" { - #include "BLI_threads.h" - #include "RE_pipeline.h" - #include "RE_shader_ext.h" - #include "RE_render_ext.h" - #include "MEM_guardedalloc.h" - #include "render_types.h" +# include "BLI_threads.h" +# include "RE_pipeline.h" +# include "RE_shader_ext.h" +# include "RE_render_ext.h" +# include "MEM_guardedalloc.h" +# include "render_types.h" } #include "PIL_time.h" diff --git a/source/blender/compositor/operations/COM_ConvertColorProfileOperation.cpp b/source/blender/compositor/operations/COM_ConvertColorProfileOperation.cpp index cb269b16bf4..b99940a8862 100644 --- a/source/blender/compositor/operations/COM_ConvertColorProfileOperation.cpp +++ b/source/blender/compositor/operations/COM_ConvertColorProfileOperation.cpp @@ -23,7 +23,7 @@ #include "COM_ConvertColorProfileOperation.h" extern "C" { - #include "IMB_imbuf.h" +# include "IMB_imbuf.h" } ConvertColorProfileOperation::ConvertColorProfileOperation() : NodeOperation() { diff --git a/source/blender/compositor/operations/COM_CurveBaseOperation.cpp b/source/blender/compositor/operations/COM_CurveBaseOperation.cpp index 36c49859880..408395bfcf0 100644 --- a/source/blender/compositor/operations/COM_CurveBaseOperation.cpp +++ b/source/blender/compositor/operations/COM_CurveBaseOperation.cpp @@ -25,7 +25,7 @@ #ifdef __cplusplus extern "C" { #endif - #include "BKE_colortools.h" +# include "BKE_colortools.h" #ifdef __cplusplus } #endif diff --git a/source/blender/compositor/operations/COM_DirectionalBlurOperation.cpp b/source/blender/compositor/operations/COM_DirectionalBlurOperation.cpp index d6c25574d01..0cea2a7183f 100644 --- a/source/blender/compositor/operations/COM_DirectionalBlurOperation.cpp +++ b/source/blender/compositor/operations/COM_DirectionalBlurOperation.cpp @@ -24,7 +24,7 @@ #include "BLI_math.h" #include "COM_OpenCLDevice.h" extern "C" { - #include "RE_pipeline.h" +# include "RE_pipeline.h" } DirectionalBlurOperation::DirectionalBlurOperation() : NodeOperation() diff --git a/source/blender/compositor/operations/COM_GaussianAlphaXBlurOperation.cpp b/source/blender/compositor/operations/COM_GaussianAlphaXBlurOperation.cpp index 2fdfd392d5d..400c6b5e3b1 100644 --- a/source/blender/compositor/operations/COM_GaussianAlphaXBlurOperation.cpp +++ b/source/blender/compositor/operations/COM_GaussianAlphaXBlurOperation.cpp @@ -26,7 +26,7 @@ #include "MEM_guardedalloc.h" extern "C" { - #include "RE_pipeline.h" +# include "RE_pipeline.h" } GaussianAlphaXBlurOperation::GaussianAlphaXBlurOperation() : BlurBaseOperation(COM_DT_VALUE) diff --git a/source/blender/compositor/operations/COM_GaussianAlphaYBlurOperation.cpp b/source/blender/compositor/operations/COM_GaussianAlphaYBlurOperation.cpp index e8b5eec581e..4866fb9b428 100644 --- a/source/blender/compositor/operations/COM_GaussianAlphaYBlurOperation.cpp +++ b/source/blender/compositor/operations/COM_GaussianAlphaYBlurOperation.cpp @@ -26,7 +26,7 @@ #include "MEM_guardedalloc.h" extern "C" { - #include "RE_pipeline.h" +# include "RE_pipeline.h" } GaussianAlphaYBlurOperation::GaussianAlphaYBlurOperation() : BlurBaseOperation(COM_DT_VALUE) diff --git a/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.cpp b/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.cpp index c236c73e50f..41d1fe65b11 100644 --- a/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.cpp +++ b/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.cpp @@ -24,7 +24,7 @@ #include "BLI_math.h" #include "MEM_guardedalloc.h" extern "C" { - #include "RE_pipeline.h" +# include "RE_pipeline.h" } GaussianBokehBlurOperation::GaussianBokehBlurOperation() : BlurBaseOperation(COM_DT_COLOR) diff --git a/source/blender/compositor/operations/COM_GaussianXBlurOperation.cpp b/source/blender/compositor/operations/COM_GaussianXBlurOperation.cpp index 93cfa4bcf93..648ca0965c8 100644 --- a/source/blender/compositor/operations/COM_GaussianXBlurOperation.cpp +++ b/source/blender/compositor/operations/COM_GaussianXBlurOperation.cpp @@ -25,7 +25,7 @@ #include "MEM_guardedalloc.h" extern "C" { - #include "RE_pipeline.h" +# include "RE_pipeline.h" } GaussianXBlurOperation::GaussianXBlurOperation() : BlurBaseOperation(COM_DT_COLOR) diff --git a/source/blender/compositor/operations/COM_GaussianYBlurOperation.cpp b/source/blender/compositor/operations/COM_GaussianYBlurOperation.cpp index 118de6bb846..f58e3a2b4f2 100644 --- a/source/blender/compositor/operations/COM_GaussianYBlurOperation.cpp +++ b/source/blender/compositor/operations/COM_GaussianYBlurOperation.cpp @@ -25,7 +25,7 @@ #include "MEM_guardedalloc.h" extern "C" { - #include "RE_pipeline.h" +# include "RE_pipeline.h" } GaussianYBlurOperation::GaussianYBlurOperation() : BlurBaseOperation(COM_DT_COLOR) diff --git a/source/blender/compositor/operations/COM_GlareFogGlowOperation.cpp b/source/blender/compositor/operations/COM_GlareFogGlowOperation.cpp index 592ad114113..f656b7f4892 100644 --- a/source/blender/compositor/operations/COM_GlareFogGlowOperation.cpp +++ b/source/blender/compositor/operations/COM_GlareFogGlowOperation.cpp @@ -147,13 +147,13 @@ static void FHT2D(fREAL *data, unsigned int Mx, unsigned int My, else { // rectangular unsigned int k, Nym = Ny - 1, stm = 1 << (Mx + My); for (i = 0; stm > 0; i++) { - #define PRED(k) (((k & Nym) << Mx) + (k >> My)) +#define PRED(k) (((k & Nym) << Mx) + (k >> My)) for (j = PRED(i); j > i; j = PRED(j)) ; if (j < i) continue; for (k = i, j = PRED(i); j != i; k = j, j = PRED(j), stm--) { t = data[j], data[j] = data[k], data[k] = t; } - #undef PRED +#undef PRED stm--; } } diff --git a/source/blender/compositor/operations/COM_HueSaturationValueCorrectOperation.cpp b/source/blender/compositor/operations/COM_HueSaturationValueCorrectOperation.cpp index 6bbaac8e303..2cdf0170fbd 100644 --- a/source/blender/compositor/operations/COM_HueSaturationValueCorrectOperation.cpp +++ b/source/blender/compositor/operations/COM_HueSaturationValueCorrectOperation.cpp @@ -27,7 +27,7 @@ #ifdef __cplusplus extern "C" { #endif - #include "BKE_colortools.h" +# include "BKE_colortools.h" #ifdef __cplusplus } #endif diff --git a/source/blender/compositor/operations/COM_ImageOperation.cpp b/source/blender/compositor/operations/COM_ImageOperation.cpp index 353d6e8f6ce..2733c483146 100644 --- a/source/blender/compositor/operations/COM_ImageOperation.cpp +++ b/source/blender/compositor/operations/COM_ImageOperation.cpp @@ -28,12 +28,12 @@ #include "BLI_math.h" extern "C" { - #include "RE_pipeline.h" - #include "RE_shader_ext.h" - #include "RE_render_ext.h" - #include "IMB_imbuf.h" - #include "IMB_imbuf_types.h" - #include "IMB_colormanagement.h" +# include "RE_pipeline.h" +# include "RE_shader_ext.h" +# include "RE_render_ext.h" +# include "IMB_imbuf.h" +# include "IMB_imbuf_types.h" +# include "IMB_colormanagement.h" } BaseImageOperation::BaseImageOperation() : NodeOperation() diff --git a/source/blender/compositor/operations/COM_ImageOperation.h b/source/blender/compositor/operations/COM_ImageOperation.h index a9e2ed9ff64..206f1509f60 100644 --- a/source/blender/compositor/operations/COM_ImageOperation.h +++ b/source/blender/compositor/operations/COM_ImageOperation.h @@ -28,10 +28,10 @@ #include "BLI_listbase.h" #include "BKE_image.h" extern "C" { - #include "RE_pipeline.h" - #include "RE_shader_ext.h" - #include "RE_render_ext.h" - #include "MEM_guardedalloc.h" +# include "RE_pipeline.h" +# include "RE_shader_ext.h" +# include "RE_render_ext.h" +# include "MEM_guardedalloc.h" } /** diff --git a/source/blender/compositor/operations/COM_KeyingScreenOperation.cpp b/source/blender/compositor/operations/COM_KeyingScreenOperation.cpp index 201dc99eb9e..0a1587c6ffa 100644 --- a/source/blender/compositor/operations/COM_KeyingScreenOperation.cpp +++ b/source/blender/compositor/operations/COM_KeyingScreenOperation.cpp @@ -30,11 +30,11 @@ #include "BLI_math_color.h" extern "C" { - #include "BKE_movieclip.h" - #include "BKE_tracking.h" +# include "BKE_movieclip.h" +# include "BKE_tracking.h" - #include "IMB_imbuf.h" - #include "IMB_imbuf_types.h" +# include "IMB_imbuf.h" +# include "IMB_imbuf_types.h" } KeyingScreenOperation::KeyingScreenOperation() : NodeOperation() diff --git a/source/blender/compositor/operations/COM_KeyingScreenOperation.h b/source/blender/compositor/operations/COM_KeyingScreenOperation.h index fa22ba668b9..10cf48e57f4 100644 --- a/source/blender/compositor/operations/COM_KeyingScreenOperation.h +++ b/source/blender/compositor/operations/COM_KeyingScreenOperation.h @@ -35,7 +35,7 @@ #include "BLI_string.h" extern "C" { - #include "BLI_voronoi.h" +# include "BLI_voronoi.h" } /** diff --git a/source/blender/compositor/operations/COM_MaskOperation.cpp b/source/blender/compositor/operations/COM_MaskOperation.cpp index a5b1987d4b3..7ee2c111932 100644 --- a/source/blender/compositor/operations/COM_MaskOperation.cpp +++ b/source/blender/compositor/operations/COM_MaskOperation.cpp @@ -29,7 +29,7 @@ #include "BLI_math.h" extern "C" { - #include "BKE_mask.h" +# include "BKE_mask.h" } MaskOperation::MaskOperation() : NodeOperation() diff --git a/source/blender/compositor/operations/COM_MixOperation.cpp b/source/blender/compositor/operations/COM_MixOperation.cpp index 9781cb4e162..125de842892 100644 --- a/source/blender/compositor/operations/COM_MixOperation.cpp +++ b/source/blender/compositor/operations/COM_MixOperation.cpp @@ -23,7 +23,7 @@ #include "COM_MixOperation.h" extern "C" { - #include "BLI_math.h" +# include "BLI_math.h" } /* ******** Mix Base Operation ******** */ diff --git a/source/blender/compositor/operations/COM_MovieClipAttributeOperation.cpp b/source/blender/compositor/operations/COM_MovieClipAttributeOperation.cpp index fbbfa8fd65e..447ca1bb4f6 100644 --- a/source/blender/compositor/operations/COM_MovieClipAttributeOperation.cpp +++ b/source/blender/compositor/operations/COM_MovieClipAttributeOperation.cpp @@ -22,8 +22,8 @@ #include "COM_MovieClipAttributeOperation.h" extern "C" { - #include "BKE_tracking.h" - #include "BKE_movieclip.h" +# include "BKE_tracking.h" +# include "BKE_movieclip.h" } MovieClipAttributeOperation::MovieClipAttributeOperation() : NodeOperation() { diff --git a/source/blender/compositor/operations/COM_MovieClipOperation.cpp b/source/blender/compositor/operations/COM_MovieClipOperation.cpp index dcb5ca06662..9a184ae1216 100644 --- a/source/blender/compositor/operations/COM_MovieClipOperation.cpp +++ b/source/blender/compositor/operations/COM_MovieClipOperation.cpp @@ -25,8 +25,8 @@ #include "BLI_listbase.h" #include "BLI_math.h" extern "C" { - #include "BKE_movieclip.h" - #include "IMB_imbuf.h" +# include "BKE_movieclip.h" +# include "IMB_imbuf.h" } #include "BKE_image.h" diff --git a/source/blender/compositor/operations/COM_MovieDistortionOperation.cpp b/source/blender/compositor/operations/COM_MovieDistortionOperation.cpp index bc792244dcb..28b1fc11a7c 100644 --- a/source/blender/compositor/operations/COM_MovieDistortionOperation.cpp +++ b/source/blender/compositor/operations/COM_MovieDistortionOperation.cpp @@ -23,9 +23,9 @@ #include "COM_MovieDistortionOperation.h" extern "C" { - #include "BKE_tracking.h" - #include "BKE_movieclip.h" - #include "BLI_linklist.h" +# include "BKE_tracking.h" +# include "BKE_movieclip.h" +# include "BLI_linklist.h" } diff --git a/source/blender/compositor/operations/COM_MovieDistortionOperation.h b/source/blender/compositor/operations/COM_MovieDistortionOperation.h index 42c4a84f9b2..a1dd08d8624 100644 --- a/source/blender/compositor/operations/COM_MovieDistortionOperation.h +++ b/source/blender/compositor/operations/COM_MovieDistortionOperation.h @@ -28,8 +28,8 @@ #include "MEM_guardedalloc.h" extern "C" { - #include "BKE_tracking.h" - #include "PIL_time.h" +# include "BKE_tracking.h" +# include "PIL_time.h" } #define COM_DISTORTIONCACHE_MAXSIZE 10 diff --git a/source/blender/compositor/operations/COM_MultilayerImageOperation.cpp b/source/blender/compositor/operations/COM_MultilayerImageOperation.cpp index ffa319f20a8..23fba5a7999 100644 --- a/source/blender/compositor/operations/COM_MultilayerImageOperation.cpp +++ b/source/blender/compositor/operations/COM_MultilayerImageOperation.cpp @@ -23,8 +23,8 @@ #include "COM_MultilayerImageOperation.h" extern "C" { - #include "IMB_imbuf.h" - #include "IMB_imbuf_types.h" +# include "IMB_imbuf.h" +# include "IMB_imbuf_types.h" } MultilayerBaseOperation::MultilayerBaseOperation(int passindex) : BaseImageOperation() diff --git a/source/blender/compositor/operations/COM_OutputFileOperation.cpp b/source/blender/compositor/operations/COM_OutputFileOperation.cpp index c94387337c3..094b2c4268a 100644 --- a/source/blender/compositor/operations/COM_OutputFileOperation.cpp +++ b/source/blender/compositor/operations/COM_OutputFileOperation.cpp @@ -34,10 +34,10 @@ #include "DNA_color_types.h" extern "C" { - #include "MEM_guardedalloc.h" - #include "IMB_imbuf.h" - #include "IMB_colormanagement.h" - #include "IMB_imbuf_types.h" +# include "MEM_guardedalloc.h" +# include "IMB_imbuf.h" +# include "IMB_colormanagement.h" +# include "IMB_imbuf_types.h" } static int get_datatype_size(DataType datatype) diff --git a/source/blender/compositor/operations/COM_PlaneTrackCommonOperation.cpp b/source/blender/compositor/operations/COM_PlaneTrackCommonOperation.cpp index 51e803f696b..5deb7b99bce 100644 --- a/source/blender/compositor/operations/COM_PlaneTrackCommonOperation.cpp +++ b/source/blender/compositor/operations/COM_PlaneTrackCommonOperation.cpp @@ -28,9 +28,9 @@ #include "BLI_math_color.h" extern "C" { - #include "BKE_movieclip.h" - #include "BKE_node.h" - #include "BKE_tracking.h" +# include "BKE_movieclip.h" +# include "BKE_node.h" +# include "BKE_tracking.h" } PlaneTrackCommonOperation::PlaneTrackCommonOperation() : NodeOperation() diff --git a/source/blender/compositor/operations/COM_PlaneTrackMaskOperation.cpp b/source/blender/compositor/operations/COM_PlaneTrackMaskOperation.cpp index 58fa4bd08dc..e43f6ab05b3 100644 --- a/source/blender/compositor/operations/COM_PlaneTrackMaskOperation.cpp +++ b/source/blender/compositor/operations/COM_PlaneTrackMaskOperation.cpp @@ -28,11 +28,11 @@ #include "BLI_math_color.h" extern "C" { - #include "BLI_jitter.h" +# include "BLI_jitter.h" - #include "BKE_movieclip.h" - #include "BKE_node.h" - #include "BKE_tracking.h" +# include "BKE_movieclip.h" +# include "BKE_node.h" +# include "BKE_tracking.h" } PlaneTrackMaskOperation::PlaneTrackMaskOperation() : PlaneTrackCommonOperation() diff --git a/source/blender/compositor/operations/COM_PlaneTrackWarpImageOperation.cpp b/source/blender/compositor/operations/COM_PlaneTrackWarpImageOperation.cpp index 7780023c465..6579276fa9f 100644 --- a/source/blender/compositor/operations/COM_PlaneTrackWarpImageOperation.cpp +++ b/source/blender/compositor/operations/COM_PlaneTrackWarpImageOperation.cpp @@ -29,11 +29,11 @@ #include "BLI_math_color.h" extern "C" { - #include "BLI_jitter.h" +# include "BLI_jitter.h" - #include "BKE_movieclip.h" - #include "BKE_node.h" - #include "BKE_tracking.h" +# include "BKE_movieclip.h" +# include "BKE_node.h" +# include "BKE_tracking.h" } BLI_INLINE void warpCoord(float x, float y, float matrix[3][3], float uv[2], float deriv[2][2]) diff --git a/source/blender/compositor/operations/COM_PreviewOperation.cpp b/source/blender/compositor/operations/COM_PreviewOperation.cpp index add9e8b959e..2ea18f64aab 100644 --- a/source/blender/compositor/operations/COM_PreviewOperation.cpp +++ b/source/blender/compositor/operations/COM_PreviewOperation.cpp @@ -32,11 +32,11 @@ #include "COM_defines.h" #include "BLI_math.h" extern "C" { - #include "MEM_guardedalloc.h" - #include "IMB_imbuf.h" - #include "IMB_imbuf_types.h" - #include "IMB_colormanagement.h" - #include "BKE_node.h" +# include "MEM_guardedalloc.h" +# include "IMB_imbuf.h" +# include "IMB_imbuf_types.h" +# include "IMB_colormanagement.h" +# include "BKE_node.h" } diff --git a/source/blender/compositor/operations/COM_RenderLayersProg.cpp b/source/blender/compositor/operations/COM_RenderLayersProg.cpp index f72af2780d7..e7cda208319 100644 --- a/source/blender/compositor/operations/COM_RenderLayersProg.cpp +++ b/source/blender/compositor/operations/COM_RenderLayersProg.cpp @@ -26,9 +26,9 @@ #include "DNA_scene_types.h" extern "C" { - #include "RE_pipeline.h" - #include "RE_shader_ext.h" - #include "RE_render_ext.h" +# include "RE_pipeline.h" +# include "RE_shader_ext.h" +# include "RE_render_ext.h" } /* ******** Render Layers Base Prog ******** */ diff --git a/source/blender/compositor/operations/COM_RenderLayersProg.h b/source/blender/compositor/operations/COM_RenderLayersProg.h index b76a8621b19..554e27eb579 100644 --- a/source/blender/compositor/operations/COM_RenderLayersProg.h +++ b/source/blender/compositor/operations/COM_RenderLayersProg.h @@ -29,10 +29,10 @@ #include "BLI_listbase.h" #include "BKE_image.h" extern "C" { - #include "RE_pipeline.h" - #include "RE_shader_ext.h" - #include "RE_render_ext.h" - #include "MEM_guardedalloc.h" +# include "RE_pipeline.h" +# include "RE_shader_ext.h" +# include "RE_render_ext.h" +# include "MEM_guardedalloc.h" } /** diff --git a/source/blender/compositor/operations/COM_ScreenLensDistortionOperation.cpp b/source/blender/compositor/operations/COM_ScreenLensDistortionOperation.cpp index 5d2977d361b..29c104d0b55 100644 --- a/source/blender/compositor/operations/COM_ScreenLensDistortionOperation.cpp +++ b/source/blender/compositor/operations/COM_ScreenLensDistortionOperation.cpp @@ -23,9 +23,9 @@ #include "COM_ScreenLensDistortionOperation.h" extern "C" { - #include "BLI_math.h" - #include "BLI_utildefines.h" - #include "BLI_rand.h" +# include "BLI_math.h" +# include "BLI_utildefines.h" +# include "BLI_rand.h" } ScreenLensDistortionOperation::ScreenLensDistortionOperation() : NodeOperation() diff --git a/source/blender/compositor/operations/COM_SplitOperation.cpp b/source/blender/compositor/operations/COM_SplitOperation.cpp index 210095f3bf1..9278f1c3ec4 100644 --- a/source/blender/compositor/operations/COM_SplitOperation.cpp +++ b/source/blender/compositor/operations/COM_SplitOperation.cpp @@ -29,9 +29,9 @@ #include "BLI_math_vector.h" extern "C" { - #include "MEM_guardedalloc.h" - #include "IMB_imbuf.h" - #include "IMB_imbuf_types.h" +# include "MEM_guardedalloc.h" +# include "IMB_imbuf.h" +# include "IMB_imbuf_types.h" } diff --git a/source/blender/compositor/operations/COM_TextureOperation.h b/source/blender/compositor/operations/COM_TextureOperation.h index 064e63c025a..114cee00530 100644 --- a/source/blender/compositor/operations/COM_TextureOperation.h +++ b/source/blender/compositor/operations/COM_TextureOperation.h @@ -28,10 +28,10 @@ #include "DNA_texture_types.h" #include "BLI_listbase.h" extern "C" { - #include "RE_pipeline.h" - #include "RE_shader_ext.h" - #include "RE_render_ext.h" - #include "MEM_guardedalloc.h" +# include "RE_pipeline.h" +# include "RE_shader_ext.h" +# include "RE_render_ext.h" +# include "MEM_guardedalloc.h" } /** diff --git a/source/blender/compositor/operations/COM_TrackPositionOperation.cpp b/source/blender/compositor/operations/COM_TrackPositionOperation.cpp index 721b17bcff0..a76e0866d0d 100644 --- a/source/blender/compositor/operations/COM_TrackPositionOperation.cpp +++ b/source/blender/compositor/operations/COM_TrackPositionOperation.cpp @@ -30,9 +30,9 @@ #include "BLI_math_color.h" extern "C" { - #include "BKE_movieclip.h" - #include "BKE_node.h" - #include "BKE_tracking.h" +# include "BKE_movieclip.h" +# include "BKE_node.h" +# include "BKE_tracking.h" } TrackPositionOperation::TrackPositionOperation() : NodeOperation() diff --git a/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.cpp b/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.cpp index 8bdaa0f486e..4b81001fdab 100644 --- a/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.cpp +++ b/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.cpp @@ -25,7 +25,7 @@ #include "COM_OpenCLDevice.h" extern "C" { - #include "RE_pipeline.h" +# include "RE_pipeline.h" } VariableSizeBokehBlurOperation::VariableSizeBokehBlurOperation() : NodeOperation() diff --git a/source/blender/compositor/operations/COM_VectorBlurOperation.cpp b/source/blender/compositor/operations/COM_VectorBlurOperation.cpp index 08ef1249a6a..f5890157440 100644 --- a/source/blender/compositor/operations/COM_VectorBlurOperation.cpp +++ b/source/blender/compositor/operations/COM_VectorBlurOperation.cpp @@ -27,7 +27,7 @@ // use the implementation of blender internal renderer to calculate the vector blur. extern "C" { - #include "RE_pipeline.h" +# include "RE_pipeline.h" } VectorBlurOperation::VectorBlurOperation() : NodeOperation() diff --git a/source/blender/compositor/operations/COM_VectorCurveOperation.cpp b/source/blender/compositor/operations/COM_VectorCurveOperation.cpp index 204b0f2011b..fedc8c6db7d 100644 --- a/source/blender/compositor/operations/COM_VectorCurveOperation.cpp +++ b/source/blender/compositor/operations/COM_VectorCurveOperation.cpp @@ -25,7 +25,7 @@ #ifdef __cplusplus extern "C" { #endif - #include "BKE_colortools.h" +# include "BKE_colortools.h" #ifdef __cplusplus } #endif diff --git a/source/blender/compositor/operations/COM_ViewerOperation.cpp b/source/blender/compositor/operations/COM_ViewerOperation.cpp index 8997f7bb436..aa0806944db 100644 --- a/source/blender/compositor/operations/COM_ViewerOperation.cpp +++ b/source/blender/compositor/operations/COM_ViewerOperation.cpp @@ -32,10 +32,10 @@ #include "BLI_math_vector.h" extern "C" { - #include "MEM_guardedalloc.h" - #include "IMB_imbuf.h" - #include "IMB_imbuf_types.h" - #include "IMB_colormanagement.h" +# include "MEM_guardedalloc.h" +# include "IMB_imbuf.h" +# include "IMB_imbuf_types.h" +# include "IMB_colormanagement.h" } diff --git a/source/blender/editors/animation/anim_channels_edit.c b/source/blender/editors/animation/anim_channels_edit.c index 338ee646b03..57bf6978174 100644 --- a/source/blender/editors/animation/anim_channels_edit.c +++ b/source/blender/editors/animation/anim_channels_edit.c @@ -215,10 +215,10 @@ void ANIM_deselect_anim_channels(bAnimContext *ac, void *data, short datatype, s sel = ACHANNEL_SETFLAG_CLEAR; break; case ANIMTYPE_OBJECT: - #if 0 /* for now, do not take object selection into account, since it gets too annoying */ +#if 0 /* for now, do not take object selection into account, since it gets too annoying */ if (ale->flag & SELECT) sel = ACHANNEL_SETFLAG_CLEAR; - #endif +#endif break; case ANIMTYPE_GROUP: if (ale->flag & AGRP_SELECTED) @@ -286,7 +286,7 @@ void ANIM_deselect_anim_channels(bAnimContext *ac, void *data, short datatype, s } case ANIMTYPE_OBJECT: { - #if 0 /* for now, do not take object selection into account, since it gets too annoying */ +#if 0 /* for now, do not take object selection into account, since it gets too annoying */ Base *base = (Base *)ale->data; Object *ob = base->object; @@ -296,7 +296,7 @@ void ANIM_deselect_anim_channels(bAnimContext *ac, void *data, short datatype, s if (ob->adt) { ACHANNEL_SET_FLAG(ob, sel, ADT_UI_SELECTED); } - #endif +#endif break; } case ANIMTYPE_GROUP: diff --git a/source/blender/editors/animation/keyframes_edit.c b/source/blender/editors/animation/keyframes_edit.c index 71717284d8e..65669062667 100644 --- a/source/blender/editors/animation/keyframes_edit.c +++ b/source/blender/editors/animation/keyframes_edit.c @@ -445,9 +445,9 @@ static short ok_bezier_frame(KeyframeEditData *ked, BezTriple *bezt) short ok = 0; /* frame is stored in f1 property (this float accuracy check may need to be dropped?) */ - #define KEY_CHECK_OK(_index) IS_EQF(bezt->vec[_index][0], ked->f1) +#define KEY_CHECK_OK(_index) IS_EQF(bezt->vec[_index][0], ked->f1) KEYFRAME_OK_CHECKS(KEY_CHECK_OK); - #undef KEY_CHECK_OK +#undef KEY_CHECK_OK /* return ok flags */ return ok; @@ -458,9 +458,9 @@ static short ok_bezier_framerange(KeyframeEditData *ked, BezTriple *bezt) short ok = 0; /* frame range is stored in float properties */ - #define KEY_CHECK_OK(_index) ((bezt->vec[_index][0] > ked->f1) && (bezt->vec[_index][0] < ked->f2)) +#define KEY_CHECK_OK(_index) ((bezt->vec[_index][0] > ked->f1) && (bezt->vec[_index][0] < ked->f2)) KEYFRAME_OK_CHECKS(KEY_CHECK_OK); - #undef KEY_CHECK_OK +#undef KEY_CHECK_OK /* return ok flags */ return ok; @@ -485,9 +485,9 @@ static short ok_bezier_value(KeyframeEditData *ked, BezTriple *bezt) * - this float accuracy check may need to be dropped? * - should value be stored in f2 instead so that we won't have conflicts when using f1 for frames too? */ - #define KEY_CHECK_OK(_index) IS_EQF(bezt->vec[_index][1], ked->f1) +#define KEY_CHECK_OK(_index) IS_EQF(bezt->vec[_index][1], ked->f1) KEYFRAME_OK_CHECKS(KEY_CHECK_OK); - #undef KEY_CHECK_OK +#undef KEY_CHECK_OK /* return ok flags */ return ok; @@ -498,9 +498,9 @@ static short ok_bezier_valuerange(KeyframeEditData *ked, BezTriple *bezt) short ok = 0; /* value range is stored in float properties */ - #define KEY_CHECK_OK(_index) ((bezt->vec[_index][1] > ked->f1) && (bezt->vec[_index][1] < ked->f2)) +#define KEY_CHECK_OK(_index) ((bezt->vec[_index][1] > ked->f1) && (bezt->vec[_index][1] < ked->f2)) KEYFRAME_OK_CHECKS(KEY_CHECK_OK); - #undef KEY_CHECK_OK +#undef KEY_CHECK_OK /* return ok flags */ return ok; @@ -512,9 +512,9 @@ static short ok_bezier_region(KeyframeEditData *ked, BezTriple *bezt) if (ked->data) { short ok = 0; - #define KEY_CHECK_OK(_index) BLI_rctf_isect_pt_v(ked->data, bezt->vec[_index]) +#define KEY_CHECK_OK(_index) BLI_rctf_isect_pt_v(ked->data, bezt->vec[_index]) KEYFRAME_OK_CHECKS(KEY_CHECK_OK); - #undef KEY_CHECK_OK +#undef KEY_CHECK_OK /* return ok flags */ return ok; diff --git a/source/blender/editors/armature/reeb.c b/source/blender/editors/armature/reeb.c index 3a09f531d44..d521de54576 100644 --- a/source/blender/editors/armature/reeb.c +++ b/source/blender/editors/armature/reeb.c @@ -1789,7 +1789,7 @@ int filterSmartReebGraph(ReebGraph *UNUSED(rg), float UNUSED(threshold)) arc = nextArc; } - #endif +#endif return value; } diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c index f44595d6af6..9ea1d147328 100644 --- a/source/blender/editors/interface/interface_handlers.c +++ b/source/blender/editors/interface/interface_handlers.c @@ -5594,7 +5594,7 @@ static bool ui_but_menu(bContext *C, uiBut *but) RNA_string_set(&ptr_props, "doc_new", RNA_property_description(but->rnaprop)); uiItemFullO(layout, "WM_OT_doc_edit", "Submit Description", ICON_NONE, ptr_props.data, WM_OP_INVOKE_DEFAULT, 0); - #endif +#endif } else if (but->optype) { WM_operator_py_idname(buf, but->optype->idname); diff --git a/source/blender/editors/mesh/editmesh_knife.c b/source/blender/editors/mesh/editmesh_knife.c index 102bad26e28..64175c133ea 100644 --- a/source/blender/editors/mesh/editmesh_knife.c +++ b/source/blender/editors/mesh/editmesh_knife.c @@ -228,7 +228,7 @@ static bool knife_verts_edge_in_face(KnifeVert *v1, KnifeVert *v2, BMFace *f); static void knife_update_header(bContext *C, KnifeTool_OpData *kcd) { - #define HEADER_LENGTH 256 +#define HEADER_LENGTH 256 char header[HEADER_LENGTH]; BLI_snprintf(header, HEADER_LENGTH, IFACE_("LMB: define cut lines, Return/Spacebar: confirm, Esc or RMB: cancel, " @@ -238,8 +238,8 @@ static void knife_update_header(bContext *C, KnifeTool_OpData *kcd) WM_bool_as_string(kcd->ignore_edge_snapping), WM_bool_as_string(kcd->angle_snapping), WM_bool_as_string(kcd->cut_through)); - ED_area_headerprint(CTX_wm_area(C), header); +#undef HEADER_LENGTH } static void knife_project_v2(const KnifeTool_OpData *kcd, const float co[3], float sco[2]) diff --git a/source/blender/editors/sculpt_paint/paint_cursor.c b/source/blender/editors/sculpt_paint/paint_cursor.c index 8f4454eb2da..78af1bea8bc 100644 --- a/source/blender/editors/sculpt_paint/paint_cursor.c +++ b/source/blender/editors/sculpt_paint/paint_cursor.c @@ -197,7 +197,7 @@ static int load_tex(Brush *br, ViewContext *vc, float zoom, bool col, bool prima pool = BKE_image_pool_new(); - #pragma omp parallel for schedule(static) +#pragma omp parallel for schedule(static) for (j = 0; j < size; j++) { int i; float y; @@ -371,7 +371,7 @@ static int load_tex_cursor(Brush *br, ViewContext *vc, float zoom) curvemapping_initialize(br->curve); - #pragma omp parallel for schedule(static) +#pragma omp parallel for schedule(static) for (j = 0; j < size; j++) { int i; float y; diff --git a/source/blender/editors/sculpt_paint/paint_mask.c b/source/blender/editors/sculpt_paint/paint_mask.c index a116cb59de8..1b6f3509b88 100644 --- a/source/blender/editors/sculpt_paint/paint_mask.c +++ b/source/blender/editors/sculpt_paint/paint_mask.c @@ -111,7 +111,7 @@ static int mask_flood_fill_exec(bContext *C, wmOperator *op) sculpt_undo_push_begin("Mask flood fill"); - #pragma omp parallel for schedule(guided) if (sd->flags & SCULPT_USE_OPENMP) +#pragma omp parallel for schedule(guided) if (sd->flags & SCULPT_USE_OPENMP) for (i = 0; i < totnode; i++) { PBVHVertexIter vi; @@ -235,7 +235,7 @@ int do_sculpt_mask_box_select(ViewContext *vc, rcti *rect, bool select, bool UNU BKE_pbvh_search_gather(pbvh, BKE_pbvh_node_planes_contain_AABB, clip_planes_final, &nodes, &totnode); - #pragma omp parallel for schedule(guided) if (sd->flags & SCULPT_USE_OPENMP) +#pragma omp parallel for schedule(guided) if (sd->flags & SCULPT_USE_OPENMP) for (i = 0; i < totnode; i++) { PBVHVertexIter vi; bool any_masked = false; @@ -382,7 +382,7 @@ static int paint_mask_gesture_lasso_exec(bContext *C, wmOperator *op) /* gather nodes inside lasso's enclosing rectangle (should greatly help with bigger meshes) */ BKE_pbvh_search_gather(pbvh, BKE_pbvh_node_planes_contain_AABB, clip_planes_final, &nodes, &totnode); - #pragma omp parallel for schedule(guided) if (sd->flags & SCULPT_USE_OPENMP) +#pragma omp parallel for schedule(guided) if (sd->flags & SCULPT_USE_OPENMP) for (i = 0; i < totnode; i++) { PBVHVertexIter vi; bool any_masked = false; diff --git a/source/blender/editors/sculpt_paint/sculpt.c b/source/blender/editors/sculpt_paint/sculpt.c index 884a09a56e3..0507cfcf37d 100644 --- a/source/blender/editors/sculpt_paint/sculpt.c +++ b/source/blender/editors/sculpt_paint/sculpt.c @@ -457,7 +457,7 @@ static void paint_mesh_restore_co(Sculpt *sd, Object *ob) * entries might be inserted by sculpt_undo_push_node() into the * GHash used internally by BM_log_original_vert_co() by a * different thread. [#33787] */ - #pragma omp parallel for schedule(guided) if (sd->flags & SCULPT_USE_OPENMP && !ss->bm) +#pragma omp parallel for schedule(guided) if (sd->flags & SCULPT_USE_OPENMP && !ss->bm) for (n = 0; n < totnode; n++) { SculptUndoNode *unode; SculptUndoType type = (brush->sculpt_tool == SCULPT_TOOL_MASK ? @@ -1089,7 +1089,7 @@ static void calc_area_normal(Sculpt *sd, Object *ob, float an[3], PBVHNode **nod zero_v3(an); - #pragma omp parallel for schedule(guided) if (sd->flags & SCULPT_USE_OPENMP) +#pragma omp parallel for schedule(guided) if (sd->flags & SCULPT_USE_OPENMP) for (n = 0; n < totnode; n++) { PBVHVertexIter vd; SculptBrushTest test; @@ -1130,7 +1130,7 @@ static void calc_area_normal(Sculpt *sd, Object *ob, float an[3], PBVHNode **nod BKE_pbvh_vertex_iter_end; } - #pragma omp critical +#pragma omp critical { add_v3_v3(an, private_an); add_v3_v3(out_flip, private_out_flip); @@ -1697,7 +1697,7 @@ static void smooth(Sculpt *sd, Object *ob, PBVHNode **nodes, int totnode, for (iteration = 0; iteration <= count; ++iteration) { float strength = (iteration != count) ? 1.0f : last; - #pragma omp parallel for schedule(guided) if (sd->flags & SCULPT_USE_OPENMP) +#pragma omp parallel for schedule(guided) if (sd->flags & SCULPT_USE_OPENMP) for (n = 0; n < totnode; n++) { switch (type) { case PBVH_GRIDS: @@ -1733,7 +1733,7 @@ static void do_mask_brush_draw(Sculpt *sd, Object *ob, PBVHNode **nodes, int tot int n; /* threaded loop over nodes */ - #pragma omp parallel for schedule(guided) if (sd->flags & SCULPT_USE_OPENMP) +#pragma omp parallel for schedule(guided) if (sd->flags & SCULPT_USE_OPENMP) for (n = 0; n < totnode; n++) { PBVHVertexIter vd; SculptBrushTest test; @@ -1786,7 +1786,7 @@ static void do_draw_brush(Sculpt *sd, Object *ob, PBVHNode **nodes, int totnode) mul_v3_fl(offset, bstrength); /* threaded loop over nodes */ - #pragma omp parallel for schedule(guided) if (sd->flags & SCULPT_USE_OPENMP) +#pragma omp parallel for schedule(guided) if (sd->flags & SCULPT_USE_OPENMP) for (n = 0; n < totnode; n++) { PBVHVertexIter vd; SculptBrushTest test; @@ -1842,7 +1842,7 @@ static void do_crease_brush(Sculpt *sd, Object *ob, PBVHNode **nodes, int totnod if (brush->sculpt_tool == SCULPT_TOOL_BLOB) flippedbstrength *= -1.0f; /* threaded loop over nodes */ - #pragma omp parallel for schedule(guided) if (sd->flags & SCULPT_USE_OPENMP) +#pragma omp parallel for schedule(guided) if (sd->flags & SCULPT_USE_OPENMP) for (n = 0; n < totnode; n++) { PBVHVertexIter vd; SculptBrushTest test; @@ -1886,7 +1886,7 @@ static void do_pinch_brush(Sculpt *sd, Object *ob, PBVHNode **nodes, int totnode float bstrength = ss->cache->bstrength; int n; - #pragma omp parallel for schedule(guided) if (sd->flags & SCULPT_USE_OPENMP) +#pragma omp parallel for schedule(guided) if (sd->flags & SCULPT_USE_OPENMP) for (n = 0; n < totnode; n++) { PBVHVertexIter vd; SculptBrushTest test; @@ -1934,7 +1934,7 @@ static void do_grab_brush(Sculpt *sd, Object *ob, PBVHNode **nodes, int totnode) add_v3_v3(grab_delta, ss->cache->sculpt_normal_symm); } - #pragma omp parallel for schedule(guided) if (sd->flags & SCULPT_USE_OPENMP) +#pragma omp parallel for schedule(guided) if (sd->flags & SCULPT_USE_OPENMP) for (n = 0; n < totnode; n++) { PBVHVertexIter vd; SculptBrushTest test; @@ -1983,7 +1983,7 @@ static void do_nudge_brush(Sculpt *sd, Object *ob, PBVHNode **nodes, int totnode cross_v3_v3v3(tmp, ss->cache->sculpt_normal_symm, grab_delta); cross_v3_v3v3(cono, tmp, ss->cache->sculpt_normal_symm); - #pragma omp parallel for schedule(guided) if (sd->flags & SCULPT_USE_OPENMP) +#pragma omp parallel for schedule(guided) if (sd->flags & SCULPT_USE_OPENMP) for (n = 0; n < totnode; n++) { PBVHVertexIter vd; SculptBrushTest test; @@ -2032,7 +2032,7 @@ static void do_snake_hook_brush(Sculpt *sd, Object *ob, PBVHNode **nodes, int to add_v3_v3(grab_delta, ss->cache->sculpt_normal_symm); } - #pragma omp parallel for schedule(guided) if (sd->flags & SCULPT_USE_OPENMP) +#pragma omp parallel for schedule(guided) if (sd->flags & SCULPT_USE_OPENMP) for (n = 0; n < totnode; n++) { PBVHVertexIter vd; SculptBrushTest test; @@ -2073,7 +2073,7 @@ static void do_thumb_brush(Sculpt *sd, Object *ob, PBVHNode **nodes, int totnode cross_v3_v3v3(tmp, ss->cache->sculpt_normal_symm, grab_delta); cross_v3_v3v3(cono, tmp, ss->cache->sculpt_normal_symm); - #pragma omp parallel for schedule(guided) if (sd->flags & SCULPT_USE_OPENMP) +#pragma omp parallel for schedule(guided) if (sd->flags & SCULPT_USE_OPENMP) for (n = 0; n < totnode; n++) { PBVHVertexIter vd; SculptBrushTest test; @@ -2117,7 +2117,7 @@ static void do_rotate_brush(Sculpt *sd, Object *ob, PBVHNode **nodes, int totnod static const int flip[8] = { 1, -1, -1, 1, -1, 1, 1, -1 }; float angle = ss->cache->vertex_rotation * flip[ss->cache->mirror_symmetry_pass]; - #pragma omp parallel for schedule(guided) if (sd->flags & SCULPT_USE_OPENMP) +#pragma omp parallel for schedule(guided) if (sd->flags & SCULPT_USE_OPENMP) for (n = 0; n < totnode; n++) { PBVHVertexIter vd; SculptBrushTest test; @@ -2171,7 +2171,7 @@ static void do_layer_brush(Sculpt *sd, Object *ob, PBVHNode **nodes, int totnode mul_v3_v3v3(offset, ss->cache->scale, ss->cache->sculpt_normal_symm); - #pragma omp parallel for schedule(guided) if (sd->flags & SCULPT_USE_OPENMP) +#pragma omp parallel for schedule(guided) if (sd->flags & SCULPT_USE_OPENMP) for (n = 0; n < totnode; n++) { PBVHVertexIter vd; SculptBrushTest test; @@ -2182,7 +2182,7 @@ static void do_layer_brush(Sculpt *sd, Object *ob, PBVHNode **nodes, int totnode sculpt_orig_vert_data_init(&orig_data, ob, nodes[n]); - #pragma omp critical +#pragma omp critical { layer_disp = BKE_pbvh_node_layer_disp_get(ss->pbvh, nodes[n]); } @@ -2235,7 +2235,7 @@ static void do_inflate_brush(Sculpt *sd, Object *ob, PBVHNode **nodes, int totno float bstrength = ss->cache->bstrength; int n; - #pragma omp parallel for schedule(guided) if (sd->flags & SCULPT_USE_OPENMP) +#pragma omp parallel for schedule(guided) if (sd->flags & SCULPT_USE_OPENMP) for (n = 0; n < totnode; n++) { PBVHVertexIter vd; SculptBrushTest test; @@ -2281,7 +2281,7 @@ static void calc_flatten_center(Sculpt *sd, Object *ob, PBVHNode **nodes, int to zero_v3(fc); - #pragma omp parallel for schedule(guided) if (sd->flags & SCULPT_USE_OPENMP) +#pragma omp parallel for schedule(guided) if (sd->flags & SCULPT_USE_OPENMP) for (n = 0; n < totnode; n++) { PBVHVertexIter vd; SculptBrushTest test; @@ -2347,7 +2347,7 @@ static void calc_flatten_center(Sculpt *sd, Object *ob, PBVHNode **nodes, int to BKE_pbvh_vertex_iter_end; } - #pragma omp critical +#pragma omp critical { add_v3_v3(fc, private_fc); add_v3_v3(fc_flip, private_fc_flip); @@ -2388,7 +2388,7 @@ static void calc_area_normal_and_flatten_center(Sculpt *sd, Object *ob, /* for flatten center */ zero_v3(fc); - #pragma omp parallel for schedule(guided) if (sd->flags & SCULPT_USE_OPENMP) +#pragma omp parallel for schedule(guided) if (sd->flags & SCULPT_USE_OPENMP) for (n = 0; n < totnode; n++) { PBVHVertexIter vd; SculptBrushTest test; @@ -2464,7 +2464,7 @@ static void calc_area_normal_and_flatten_center(Sculpt *sd, Object *ob, BKE_pbvh_vertex_iter_end; } - #pragma omp critical +#pragma omp critical { /* for area normal */ add_v3_v3(an, private_an); @@ -2640,7 +2640,7 @@ static void do_flatten_brush(Sculpt *sd, Object *ob, PBVHNode **nodes, int totno mul_v3_fl(temp, displace); add_v3_v3(fc, temp); - #pragma omp parallel for schedule(guided) if (sd->flags & SCULPT_USE_OPENMP) +#pragma omp parallel for schedule(guided) if (sd->flags & SCULPT_USE_OPENMP) for (n = 0; n < totnode; n++) { PBVHVertexIter vd; SculptBrushTest test; @@ -2712,7 +2712,7 @@ static void do_clay_brush(Sculpt *sd, Object *ob, PBVHNode **nodes, int totnode) /* add_v3_v3v3(p, ss->cache->location, an); */ - #pragma omp parallel for schedule(guided) if (sd->flags & SCULPT_USE_OPENMP) +#pragma omp parallel for schedule(guided) if (sd->flags & SCULPT_USE_OPENMP) for (n = 0; n < totnode; n++) { PBVHVertexIter vd; SculptBrushTest test; @@ -2814,7 +2814,7 @@ static void do_clay_strips_brush(Sculpt *sd, Object *ob, PBVHNode **nodes, int t mul_m4_m4m4(tmat, mat, scale); invert_m4_m4(mat, tmat); - #pragma omp parallel for schedule(guided) if (sd->flags & SCULPT_USE_OPENMP) +#pragma omp parallel for schedule(guided) if (sd->flags & SCULPT_USE_OPENMP) for (n = 0; n < totnode; n++) { PBVHVertexIter vd; SculptBrushTest test; @@ -2878,7 +2878,7 @@ static void do_fill_brush(Sculpt *sd, Object *ob, PBVHNode **nodes, int totnode) mul_v3_fl(temp, displace); add_v3_v3(fc, temp); - #pragma omp parallel for schedule(guided) if (sd->flags & SCULPT_USE_OPENMP) +#pragma omp parallel for schedule(guided) if (sd->flags & SCULPT_USE_OPENMP) for (n = 0; n < totnode; n++) { PBVHVertexIter vd; SculptBrushTest test; @@ -2942,7 +2942,7 @@ static void do_scrape_brush(Sculpt *sd, Object *ob, PBVHNode **nodes, int totnod mul_v3_fl(temp, displace); add_v3_v3(fc, temp); - #pragma omp parallel for schedule(guided) if (sd->flags & SCULPT_USE_OPENMP) +#pragma omp parallel for schedule(guided) if (sd->flags & SCULPT_USE_OPENMP) for (n = 0; n < totnode; n++) { PBVHVertexIter vd; SculptBrushTest test; @@ -2996,7 +2996,7 @@ static void do_gravity(Sculpt *sd, Object *ob, PBVHNode **nodes, int totnode, fl mul_v3_fl(offset, bstrength); /* threaded loop over nodes */ - #pragma omp parallel for schedule(guided) if (sd->flags & SCULPT_USE_OPENMP) +#pragma omp parallel for schedule(guided) if (sd->flags & SCULPT_USE_OPENMP) for (n = 0; n < totnode; n++) { PBVHVertexIter vd; SculptBrushTest test; @@ -3166,7 +3166,7 @@ static void do_brush_action(Sculpt *sd, Object *ob, Brush *brush) if (totnode) { float location[3]; - #pragma omp parallel for schedule(guided) if (sd->flags & SCULPT_USE_OPENMP) +#pragma omp parallel for schedule(guided) if (sd->flags & SCULPT_USE_OPENMP) for (n = 0; n < totnode; n++) { sculpt_undo_push_node(ob, nodes[n], brush->sculpt_tool == SCULPT_TOOL_MASK ? @@ -3299,7 +3299,7 @@ static void sculpt_combine_proxies(Sculpt *sd, Object *ob) const bool use_orco = ELEM3(brush->sculpt_tool, SCULPT_TOOL_GRAB, SCULPT_TOOL_ROTATE, SCULPT_TOOL_THUMB); - #pragma omp parallel for schedule(guided) if (sd->flags & SCULPT_USE_OPENMP) +#pragma omp parallel for schedule(guided) if (sd->flags & SCULPT_USE_OPENMP) for (n = 0; n < totnode; n++) { PBVHVertexIter vd; PBVHProxyNode *proxies; @@ -3392,7 +3392,7 @@ static void sculpt_flush_stroke_deform(Sculpt *sd, Object *ob) BKE_pbvh_search_gather(ss->pbvh, NULL, NULL, &nodes, &totnode); - #pragma omp parallel for schedule(guided) if (sd->flags & SCULPT_USE_OPENMP) +#pragma omp parallel for schedule(guided) if (sd->flags & SCULPT_USE_OPENMP) for (n = 0; n < totnode; n++) { PBVHVertexIter vd; @@ -4156,7 +4156,7 @@ static void sculpt_update_cache_variants(bContext *C, Sculpt *sd, Object *ob, sculpt_update_brush_delta(ups, ob, brush); if (brush->sculpt_tool == SCULPT_TOOL_ROTATE) { - #define PIXEL_INPUT_THRESHHOLD 5 +#define PIXEL_INPUT_THRESHHOLD 5 const float dx = cache->mouse[0] - cache->initial_mouse[0]; const float dy = cache->mouse[1] - cache->initial_mouse[1]; @@ -4194,7 +4194,7 @@ static void sculpt_update_cache_variants(bContext *C, Sculpt *sd, Object *ob, cache->vertex_rotation = -(mouse_angle + 2.0f * (float)M_PI * cache->num_vertex_turns) * cache->bstrength; - #undef PIXEL_INPUT_THRESHHOLD +#undef PIXEL_INPUT_THRESHHOLD } ups->draw_anchored = true; diff --git a/source/blender/editors/sculpt_paint/sculpt_undo.c b/source/blender/editors/sculpt_paint/sculpt_undo.c index e011e0f3c77..6fa5c8fbf5a 100644 --- a/source/blender/editors/sculpt_paint/sculpt_undo.c +++ b/source/blender/editors/sculpt_paint/sculpt_undo.c @@ -284,17 +284,18 @@ static void sculpt_undo_bmesh_restore_generic(bContext *C, int i, totnode; PBVHNode **nodes; - #ifdef _OPENMP +#ifdef _OPENMP Sculpt *sd = CTX_data_tool_settings(C)->sculpt; - #else +#else (void)C; - #endif +#endif BKE_pbvh_search_gather(ss->pbvh, NULL, NULL, &nodes, &totnode); - #pragma omp parallel for schedule(guided) if (sd->flags & SCULPT_USE_OPENMP) - for (i = 0; i < totnode; i++) +#pragma omp parallel for schedule(guided) if (sd->flags & SCULPT_USE_OPENMP) + for (i = 0; i < totnode; i++) { BKE_pbvh_node_mark_redraw(nodes[i]); + } } else { /* A bit lame, but for now just recreate the PBVH. The alternative diff --git a/source/blender/editors/space_image/image_draw.c b/source/blender/editors/space_image/image_draw.c index 3d5f6a6ce7e..76305aaabaa 100644 --- a/source/blender/editors/space_image/image_draw.c +++ b/source/blender/editors/space_image/image_draw.c @@ -169,15 +169,15 @@ void ED_image_draw_info(Scene *scene, ARegion *ar, int color_manage, int use_def float dx = 6; /* text colors */ /* XXX colored text not allowed in Blender UI */ - #if 0 +#if 0 unsigned char red[3] = {255, 50, 50}; unsigned char green[3] = {0, 255, 0}; unsigned char blue[3] = {100, 100, 255}; - #else +#else unsigned char red[3] = {255, 255, 255}; unsigned char green[3] = {255, 255, 255}; unsigned char blue[3] = {255, 255, 255}; - #endif +#endif float hue = 0, sat = 0, val = 0, lum = 0, u = 0, v = 0; float col[4], finalcol[4]; diff --git a/source/blender/editors/space_sequencer/sequencer_scopes.c b/source/blender/editors/space_sequencer/sequencer_scopes.c index 79b50f2d3ae..9199c6de343 100644 --- a/source/blender/editors/space_sequencer/sequencer_scopes.c +++ b/source/blender/editors/space_sequencer/sequencer_scopes.c @@ -461,7 +461,7 @@ static ImBuf *make_histogram_view_from_ibuf_byte(ImBuf *ibuf) memset(bins, 0, sizeof(bins)); - #pragma omp parallel for shared(bins, src, ibuf) private(x, y) if (ibuf->y >= 256) +#pragma omp parallel for shared(bins, src, ibuf) private(x, y) if (ibuf->y >= 256) for (y = 0; y < ibuf->y; y++) { unsigned int cur_bins[3][HIS_STEPS]; @@ -475,7 +475,7 @@ static ImBuf *make_histogram_view_from_ibuf_byte(ImBuf *ibuf) cur_bins[2][pixel[2]]++; } - #pragma omp critical +#pragma omp critical { int i; for (i = 0; i < HIS_STEPS; i++) { @@ -538,7 +538,7 @@ static ImBuf *make_histogram_view_from_ibuf_float(ImBuf *ibuf) memset(bins, 0, sizeof(bins)); - #pragma omp parallel for shared(bins, src, ibuf) private(x, y) if (ibuf->y >= 256) +#pragma omp parallel for shared(bins, src, ibuf) private(x, y) if (ibuf->y >= 256) for (y = 0; y < ibuf->y; y++) { unsigned int cur_bins[3][HIS_STEPS]; @@ -552,7 +552,7 @@ static ImBuf *make_histogram_view_from_ibuf_float(ImBuf *ibuf) cur_bins[2][get_bin_float(pixel[2])]++; } - #pragma omp critical +#pragma omp critical { int i; for (i = 0; i < HIS_STEPS; i++) { diff --git a/source/blender/editors/space_view3d/drawanimviz.c b/source/blender/editors/space_view3d/drawanimviz.c index 902a9976f48..82e85e3a449 100644 --- a/source/blender/editors/space_view3d/drawanimviz.c +++ b/source/blender/editors/space_view3d/drawanimviz.c @@ -147,7 +147,7 @@ void draw_motion_path_instance(Scene *scene, * - black for before current frame, green for current frame, blue for after current frame * - intensity decreases as distance from current frame increases */ - #define SET_INTENSITY(A, B, C, min, max) (((1.0f - ((C - B) / (C - A))) * (max - min)) + min) +#define SET_INTENSITY(A, B, C, min, max) (((1.0f - ((C - B) / (C - A))) * (max - min)) + min) if (frame < CFRA) { /* black - before cfra */ if (sel) { @@ -182,7 +182,8 @@ void draw_motion_path_instance(Scene *scene, } UI_ThemeColorBlendShade(TH_CFRAME, TH_BACK, intensity, 10); } - +#undef SET_INTENSITY + /* draw a vertex with this color */ glVertex3fv(mpv->co); } diff --git a/source/blender/editors/space_view3d/drawvolume.c b/source/blender/editors/space_view3d/drawvolume.c index eb4493a9d1a..32e21a0fbbe 100644 --- a/source/blender/editors/space_view3d/drawvolume.c +++ b/source/blender/editors/space_view3d/drawvolume.c @@ -244,10 +244,10 @@ void draw_smoke_volume(SmokeDomainSettings *sds, Object *ob, #endif /* generate flame spectrum texture */ - #define SPEC_WIDTH 256 - #define FIRE_THRESH 7 - #define MAX_FIRE_ALPHA 0.06f - #define FULL_ON_FIRE 100 +#define SPEC_WIDTH 256 +#define FIRE_THRESH 7 +#define MAX_FIRE_ALPHA 0.06f +#define FULL_ON_FIRE 100 spec_data = malloc(SPEC_WIDTH * 4 * sizeof(unsigned char)); flame_get_spectrum(spec_data, SPEC_WIDTH, 1500, 3000); spec_pixels = malloc(SPEC_WIDTH * 4 * 16 * 16 * sizeof(float)); @@ -271,6 +271,11 @@ void draw_smoke_volume(SmokeDomainSettings *sds, Object *ob, tex_spec = GPU_texture_create_1D(SPEC_WIDTH, spec_pixels, NULL); +#undef SPEC_WIDTH +#undef FIRE_THRESH +#undef MAX_FIRE_ALPHA +#undef FULL_ON_FIRE + sub_v3_v3v3(size, max, min); /* maxx, maxy, maxz */ diff --git a/source/blender/editors/space_view3d/view3d_edit.c b/source/blender/editors/space_view3d/view3d_edit.c index 36c6df75461..ab9a222b96a 100644 --- a/source/blender/editors/space_view3d/view3d_edit.c +++ b/source/blender/editors/space_view3d/view3d_edit.c @@ -3440,14 +3440,14 @@ static int viewnumpad_exec(bContext *C, wmOperator *op) rv3d->lpersp = rv3d->persp; } - #if 0 +#if 0 if (G.qual == LR_ALTKEY) { if (oldcamera && is_an_active_object(oldcamera)) { v3d->camera = oldcamera; } handle_view3d_lock(); } - #endif +#endif /* first get the default camera for the view lock type */ if (v3d->scenelock) { diff --git a/source/blender/editors/uvedit/uvedit_parametrizer.c b/source/blender/editors/uvedit/uvedit_parametrizer.c index e5c3510db4b..34c44185026 100644 --- a/source/blender/editors/uvedit/uvedit_parametrizer.c +++ b/source/blender/editors/uvedit/uvedit_parametrizer.c @@ -52,24 +52,24 @@ /* Utils */ #if 0 - #define param_assert(condition) - #define param_warning(message) - #define param_test_equals_ptr(condition) - #define param_test_equals_int(condition) +# define param_assert(condition) +# define param_warning(message) +# define param_test_equals_ptr(condition) +# define param_test_equals_int(condition) #else - #define param_assert(condition) \ +# define param_assert(condition) \ if (!(condition)) \ { /*printf("Assertion %s:%d\n", __FILE__, __LINE__); abort();*/ } (void)0 - #define param_warning(message) \ +# define param_warning(message) \ { /*printf("Warning %s:%d: %s\n", __FILE__, __LINE__, message);*/ } (void)0 -#if 0 - #define param_test_equals_ptr(str, a, b) \ +# if 0 +# define param_test_equals_ptr(str, a, b) \ if (a != b) \ { /*printf("Equals %s => %p != %p\n", str, a, b);*/ } (void)0 - #define param_test_equals_int(str, a, b) \ +# define param_test_equals_int(str, a, b) \ if (a != b) \ { /*printf("Equals %s => %d != %d\n", str, a, b);*/ } (void)0 -#endif +# endif #endif typedef enum PBool { P_TRUE = 1, diff --git a/source/blender/editors/uvedit/uvedit_smart_stitch.c b/source/blender/editors/uvedit/uvedit_smart_stitch.c index 60747450661..c931c843a23 100644 --- a/source/blender/editors/uvedit/uvedit_smart_stitch.c +++ b/source/blender/editors/uvedit/uvedit_smart_stitch.c @@ -1529,11 +1529,11 @@ static void stitch_draw(const bContext *UNUSED(C), ARegion *UNUSED(ar), void *ar glPolygonMode(GL_FRONT_AND_BACK, GL_LINE); UI_ThemeColor4(TH_STITCH_PREVIEW_EDGE); glDrawArrays(GL_POLYGON, index, stitch_preview->uvs_per_polygon[i]); - #if 0 +#if 0 glPolygonMode(GL_FRONT_AND_BACK, GL_POINT); UI_ThemeColor4(TH_STITCH_PREVIEW_VERT); glDrawArrays(GL_POLYGON, index, stitch_preview->uvs_per_polygon[i]); - #endif +#endif index += stitch_preview->uvs_per_polygon[i]; } diff --git a/source/blender/makesrna/intern/rna_nodetree.c b/source/blender/makesrna/intern/rna_nodetree.c index 55989bd985c..38d7f051b0b 100644 --- a/source/blender/makesrna/intern/rna_nodetree.c +++ b/source/blender/makesrna/intern/rna_nodetree.c @@ -426,7 +426,7 @@ static EnumPropertyItem *rna_node_static_type_itemf(bContext *UNUSED(C), Pointer tmp.icon = ICON_NONE; RNA_enum_item_add(&item, &totitem, &tmp); - #define DefNode(Category, ID, DefFunc, EnumName, StructName, UIName, UIDesc) \ +#define DefNode(Category, ID, DefFunc, EnumName, StructName, UIName, UIDesc) \ if (STREQ(#Category, "Node")) { \ tmp.value = ID; \ tmp.identifier = EnumName; \ @@ -435,11 +435,11 @@ static EnumPropertyItem *rna_node_static_type_itemf(bContext *UNUSED(C), Pointer tmp.icon = ICON_NONE; \ RNA_enum_item_add(&item, &totitem, &tmp); \ } - #include "../../nodes/NOD_static_types.h" - #undef DefNode +#include "../../nodes/NOD_static_types.h" +#undef DefNode if (RNA_struct_is_a(ptr->type, &RNA_ShaderNode)) { - #define DefNode(Category, ID, DefFunc, EnumName, StructName, UIName, UIDesc) \ +#define DefNode(Category, ID, DefFunc, EnumName, StructName, UIName, UIDesc) \ if (STREQ(#Category, "ShaderNode")) { \ tmp.value = ID; \ tmp.identifier = EnumName; \ @@ -448,12 +448,12 @@ static EnumPropertyItem *rna_node_static_type_itemf(bContext *UNUSED(C), Pointer tmp.icon = ICON_NONE; \ RNA_enum_item_add(&item, &totitem, &tmp); \ } - #include "../../nodes/NOD_static_types.h" - #undef DefNode +#include "../../nodes/NOD_static_types.h" +#undef DefNode } if (RNA_struct_is_a(ptr->type, &RNA_CompositorNode)) { - #define DefNode(Category, ID, DefFunc, EnumName, StructName, UIName, UIDesc) \ +#define DefNode(Category, ID, DefFunc, EnumName, StructName, UIName, UIDesc) \ if (STREQ(#Category, "CompositorNode")) { \ tmp.value = ID; \ tmp.identifier = EnumName; \ @@ -462,12 +462,12 @@ static EnumPropertyItem *rna_node_static_type_itemf(bContext *UNUSED(C), Pointer tmp.icon = ICON_NONE; \ RNA_enum_item_add(&item, &totitem, &tmp); \ } - #include "../../nodes/NOD_static_types.h" - #undef DefNode +#include "../../nodes/NOD_static_types.h" +#undef DefNode } if (RNA_struct_is_a(ptr->type, &RNA_TextureNode)) { - #define DefNode(Category, ID, DefFunc, EnumName, StructName, UIName, UIDesc) \ +#define DefNode(Category, ID, DefFunc, EnumName, StructName, UIName, UIDesc) \ if (STREQ(#Category, "TextureNode")) { \ tmp.value = ID; \ tmp.identifier = EnumName; \ @@ -476,8 +476,8 @@ static EnumPropertyItem *rna_node_static_type_itemf(bContext *UNUSED(C), Pointer tmp.icon = ICON_NONE; \ RNA_enum_item_add(&item, &totitem, &tmp); \ } - #include "../../nodes/NOD_static_types.h" - #undef DefNode +#include "../../nodes/NOD_static_types.h" +#undef DefNode } RNA_enum_item_end(&item, &totitem); @@ -7657,7 +7657,7 @@ void RNA_def_nodetree(BlenderRNA *brna) rna_def_shader_nodetree(brna); rna_def_texture_nodetree(brna); - #define DefNode(Category, ID, DefFunc, EnumName, StructName, UIName, UIDesc) \ +#define DefNode(Category, ID, DefFunc, EnumName, StructName, UIName, UIDesc) \ { \ srna = define_specific_node(brna, #Category #StructName, #Category, UIName, UIDesc, DefFunc); \ if (ID == CMP_NODE_OUTPUT_FILE) { \ @@ -7669,7 +7669,7 @@ void RNA_def_nodetree(BlenderRNA *brna) /* hack, don't want to add include path to RNA just for this, since in the future RNA types * for nodes should be defined locally at runtime anyway ... */ - #include "../../nodes/NOD_static_types.h" +#include "../../nodes/NOD_static_types.h" /* Node group types need to be defined for shader, compositor, texture nodes individually. * Cannot use the static types header for this, since they share the same int id. diff --git a/source/blender/modifiers/intern/MOD_array.c b/source/blender/modifiers/intern/MOD_array.c index 2bf7bb5f672..971b3f0cd14 100644 --- a/source/blender/modifiers/intern/MOD_array.c +++ b/source/blender/modifiers/intern/MOD_array.c @@ -469,7 +469,7 @@ static DerivedMesh *arrayModifier_doArray(ArrayModifierData *amd, amd, &index_len); } - #define _E(s, i) ((BMVert **)(s)->data.buf)[i] +#define _E(s, i) ((BMVert **)(s)->data.buf)[i] /* ensure this is set */ BLI_assert(index_len != -1); @@ -490,7 +490,7 @@ static DerivedMesh *arrayModifier_doArray(ArrayModifierData *amd, BMO_slot_map_elem_insert(&weld_op, slot_targetmap, v, v2); } - #undef _E +#undef _E } /* already copied earlier, but after executation more slot diff --git a/source/blender/modifiers/intern/MOD_ocean.c b/source/blender/modifiers/intern/MOD_ocean.c index 40a4d5e0986..e5d9a9dae0e 100644 --- a/source/blender/modifiers/intern/MOD_ocean.c +++ b/source/blender/modifiers/intern/MOD_ocean.c @@ -317,7 +317,7 @@ static DerivedMesh *generate_ocean_geometry(OceanModifierData *omd) origindex = CustomData_get_layer(&result->polyData, CD_ORIGINDEX); /* create vertices */ - #pragma omp parallel for private(x, y) if (rx > OMP_MIN_RES) +#pragma omp parallel for private(x, y) if (rx > OMP_MIN_RES) for (y = 0; y <= res_y; y++) { for (x = 0; x <= res_x; x++) { const int i = y * (res_x + 1) + x; @@ -329,7 +329,7 @@ static DerivedMesh *generate_ocean_geometry(OceanModifierData *omd) } /* create faces */ - #pragma omp parallel for private(x, y) if (rx > OMP_MIN_RES) +#pragma omp parallel for private(x, y) if (rx > OMP_MIN_RES) for (y = 0; y < res_y; y++) { for (x = 0; x < res_x; x++) { const int fi = y * res_x + x; @@ -367,7 +367,7 @@ static DerivedMesh *generate_ocean_geometry(OceanModifierData *omd) if (mloopuvs) { /* unlikely to fail */ ix = 1.0 / rx; iy = 1.0 / ry; - #pragma omp parallel for private(x, y) if (rx > OMP_MIN_RES) +#pragma omp parallel for private(x, y) if (rx > OMP_MIN_RES) for (y = 0; y < res_y; y++) { for (x = 0; x < res_x; x++) { const int i = y * res_x + x; diff --git a/source/blender/nodes/composite/node_composite_tree.c b/source/blender/nodes/composite/node_composite_tree.c index d05a5da5f1c..895d57c74f2 100644 --- a/source/blender/nodes/composite/node_composite_tree.c +++ b/source/blender/nodes/composite/node_composite_tree.c @@ -62,7 +62,7 @@ #include "node_composite_util.h" #ifdef WITH_COMPOSITOR - #include "COM_compositor.h" +# include "COM_compositor.h" #endif static void composite_get_from_context(const bContext *C, bNodeTreeType *UNUSED(treetype), bNodeTree **r_ntree, ID **r_id, ID **r_from) @@ -287,11 +287,11 @@ void ntreeCompositForceHidden(bNodeTree *ntree) /* XXX this stuff is called all the time, don't want that. * Updates should only happen when actually necessary. */ - #if 0 +#if 0 else if (node->type == CMP_NODE_IMAGE) { nodeUpdate(ntree, node); } - #endif +#endif } } diff --git a/source/blender/nodes/shader/nodes/node_shader_vectTransform.c b/source/blender/nodes/shader/nodes/node_shader_vectTransform.c index 40c70b9e23d..4cab9d3ca97 100644 --- a/source/blender/nodes/shader/nodes/node_shader_vectTransform.c +++ b/source/blender/nodes/shader/nodes/node_shader_vectTransform.c @@ -29,7 +29,7 @@ * \ingroup shdnodes */ - #include "../node_shader_util.h" +#include "../node_shader_util.h" /* **************** Vector Transform ******************** */ static bNodeSocketTemplate sh_node_vect_transform_in[] = { diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c index f17dc29aeee..120f7562f0f 100644 --- a/source/blender/windowmanager/intern/wm_operators.c +++ b/source/blender/windowmanager/intern/wm_operators.c @@ -4529,14 +4529,14 @@ void wm_window_keymap(wmKeyConfig *keyconf) /* note, this doesn't replace existing keymap items */ WM_keymap_verify_item(keymap, "WM_OT_window_duplicate", WKEY, KM_PRESS, KM_CTRL | KM_ALT, 0); - #ifdef __APPLE__ +#ifdef __APPLE__ WM_keymap_add_item(keymap, "WM_OT_read_homefile", NKEY, KM_PRESS, KM_OSKEY, 0); WM_keymap_add_menu(keymap, "INFO_MT_file_open_recent", OKEY, KM_PRESS, KM_SHIFT | KM_OSKEY, 0); WM_keymap_add_item(keymap, "WM_OT_open_mainfile", OKEY, KM_PRESS, KM_OSKEY, 0); WM_keymap_add_item(keymap, "WM_OT_save_mainfile", SKEY, KM_PRESS, KM_OSKEY, 0); WM_keymap_add_item(keymap, "WM_OT_save_as_mainfile", SKEY, KM_PRESS, KM_SHIFT | KM_OSKEY, 0); WM_keymap_add_item(keymap, "WM_OT_quit_blender", QKEY, KM_PRESS, KM_OSKEY, 0); - #endif +#endif WM_keymap_add_item(keymap, "WM_OT_read_homefile", NKEY, KM_PRESS, KM_CTRL, 0); WM_keymap_add_item(keymap, "WM_OT_save_homefile", UKEY, KM_PRESS, KM_CTRL, 0); WM_keymap_add_menu(keymap, "INFO_MT_file_open_recent", OKEY, KM_PRESS, KM_SHIFT | KM_CTRL, 0); diff --git a/source/blender/windowmanager/intern/wm_playanim.c b/source/blender/windowmanager/intern/wm_playanim.c index 8456be3d5c4..af73ccc55bb 100644 --- a/source/blender/windowmanager/intern/wm_playanim.c +++ b/source/blender/windowmanager/intern/wm_playanim.c @@ -958,9 +958,9 @@ static char *wm_main_playanim_intern(int argc, const char **argv) } #if 0 //XXX25 - #if !defined(WIN32) && !defined(__APPLE__) +#if !defined(WIN32) && !defined(__APPLE__) if (fork()) exit(0); - #endif +#endif #endif //XXX25 { diff --git a/source/gameengine/GamePlayer/ghost/GPG_Application.cpp b/source/gameengine/GamePlayer/ghost/GPG_Application.cpp index d51d0bf5c10..ac96ca097ad 100644 --- a/source/gameengine/GamePlayer/ghost/GPG_Application.cpp +++ b/source/gameengine/GamePlayer/ghost/GPG_Application.cpp @@ -32,8 +32,8 @@ #ifdef WIN32 - #pragma warning (disable:4786) // suppress stl-MSVC debug info warning - #include <windows.h> +# pragma warning (disable:4786) // suppress stl-MSVC debug info warning +# include <windows.h> #endif #include "GL/glew.h" diff --git a/source/gameengine/SceneGraph/SG_BBox.cpp b/source/gameengine/SceneGraph/SG_BBox.cpp index 3911babd2b5..0ecf6284a14 100644 --- a/source/gameengine/SceneGraph/SG_BBox.cpp +++ b/source/gameengine/SceneGraph/SG_BBox.cpp @@ -33,8 +33,8 @@ #include <math.h> - #include "SG_BBox.h" - #include "SG_Node.h" +#include "SG_BBox.h" +#include "SG_Node.h" SG_BBox::SG_BBox() : m_min(0.0, 0.0, 0.0), |