Style Cleanup: remove preprocessor indentation (updated wiki style guide too)
authorCampbell Barton <ideasman42@gmail.com>
Sun, 22 Dec 2013 03:11:10 +0000 (14:11 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Sun, 22 Dec 2013 03:12:19 +0000 (14:12 +1100)
100 files changed:
intern/cycles/render/nodes.cpp
intern/ghost/intern/GHOST_DisplayManagerX11.cpp
intern/ghost/test/gears/GHOST_Test.cpp
intern/mikktspace/mikktspace.c
source/blender/blenkernel/intern/CCGSubSurf.c
source/blender/blenkernel/intern/cdderivedmesh.c
source/blender/blenkernel/intern/dynamicpaint.c
source/blender/blenkernel/intern/mask_rasterize.c
source/blender/blenkernel/intern/multires.c
source/blender/blenkernel/intern/node.c
source/blender/blenkernel/intern/particle_system.c
source/blender/blenkernel/intern/pbvh.c
source/blender/blenkernel/intern/pbvh_bmesh.c
source/blender/blenkernel/intern/smoke.c
source/blender/blenkernel/intern/tracking.c
source/blender/blenlib/intern/path_util.c
source/blender/blenlib/intern/storage.c
source/blender/blenloader/intern/versioning_260.c
source/blender/compositor/intern/COM_MemoryBuffer.h
source/blender/compositor/intern/COM_WorkScheduler.h
source/blender/compositor/nodes/COM_ImageNode.cpp
source/blender/compositor/nodes/COM_ImageNode.h
source/blender/compositor/nodes/COM_KeyingScreenNode.cpp
source/blender/compositor/nodes/COM_MaskNode.cpp
source/blender/compositor/nodes/COM_MovieClipNode.cpp
source/blender/compositor/nodes/COM_MuteNode.cpp
source/blender/compositor/nodes/COM_MuteNode.h
source/blender/compositor/nodes/COM_PlaneTrackDeformNode.cpp
source/blender/compositor/nodes/COM_PlaneTrackDeformNode.h
source/blender/compositor/nodes/COM_Stabilize2dNode.cpp
source/blender/compositor/nodes/COM_TimeNode.cpp
source/blender/compositor/nodes/COM_TrackPositionNode.cpp
source/blender/compositor/operations/COM_AntiAliasOperation.cpp
source/blender/compositor/operations/COM_BilateralBlurOperation.cpp
source/blender/compositor/operations/COM_BlurBaseOperation.cpp
source/blender/compositor/operations/COM_BokehBlurOperation.cpp
source/blender/compositor/operations/COM_ColorCurveOperation.cpp
source/blender/compositor/operations/COM_ColorRampOperation.cpp
source/blender/compositor/operations/COM_CompositorOperation.cpp
source/blender/compositor/operations/COM_ConvertColorProfileOperation.cpp
source/blender/compositor/operations/COM_CurveBaseOperation.cpp
source/blender/compositor/operations/COM_DirectionalBlurOperation.cpp
source/blender/compositor/operations/COM_GaussianAlphaXBlurOperation.cpp
source/blender/compositor/operations/COM_GaussianAlphaYBlurOperation.cpp
source/blender/compositor/operations/COM_GaussianBokehBlurOperation.cpp
source/blender/compositor/operations/COM_GaussianXBlurOperation.cpp
source/blender/compositor/operations/COM_GaussianYBlurOperation.cpp
source/blender/compositor/operations/COM_GlareFogGlowOperation.cpp
source/blender/compositor/operations/COM_HueSaturationValueCorrectOperation.cpp
source/blender/compositor/operations/COM_ImageOperation.cpp
source/blender/compositor/operations/COM_ImageOperation.h
source/blender/compositor/operations/COM_KeyingScreenOperation.cpp
source/blender/compositor/operations/COM_KeyingScreenOperation.h
source/blender/compositor/operations/COM_MaskOperation.cpp
source/blender/compositor/operations/COM_MixOperation.cpp
source/blender/compositor/operations/COM_MovieClipAttributeOperation.cpp
source/blender/compositor/operations/COM_MovieClipOperation.cpp
source/blender/compositor/operations/COM_MovieDistortionOperation.cpp
source/blender/compositor/operations/COM_MovieDistortionOperation.h
source/blender/compositor/operations/COM_MultilayerImageOperation.cpp
source/blender/compositor/operations/COM_OutputFileOperation.cpp
source/blender/compositor/operations/COM_PlaneTrackCommonOperation.cpp
source/blender/compositor/operations/COM_PlaneTrackMaskOperation.cpp
source/blender/compositor/operations/COM_PlaneTrackWarpImageOperation.cpp
source/blender/compositor/operations/COM_PreviewOperation.cpp
source/blender/compositor/operations/COM_RenderLayersProg.cpp
source/blender/compositor/operations/COM_RenderLayersProg.h
source/blender/compositor/operations/COM_ScreenLensDistortionOperation.cpp
source/blender/compositor/operations/COM_SplitOperation.cpp
source/blender/compositor/operations/COM_TextureOperation.h
source/blender/compositor/operations/COM_TrackPositionOperation.cpp
source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.cpp
source/blender/compositor/operations/COM_VectorBlurOperation.cpp
source/blender/compositor/operations/COM_VectorCurveOperation.cpp
source/blender/compositor/operations/COM_ViewerOperation.cpp
source/blender/editors/animation/anim_channels_edit.c
source/blender/editors/animation/keyframes_edit.c
source/blender/editors/armature/reeb.c
source/blender/editors/interface/interface_handlers.c
source/blender/editors/mesh/editmesh_knife.c
source/blender/editors/sculpt_paint/paint_cursor.c
source/blender/editors/sculpt_paint/paint_mask.c
source/blender/editors/sculpt_paint/sculpt.c
source/blender/editors/sculpt_paint/sculpt_undo.c
source/blender/editors/space_image/image_draw.c
source/blender/editors/space_sequencer/sequencer_scopes.c
source/blender/editors/space_view3d/drawanimviz.c
source/blender/editors/space_view3d/drawvolume.c
source/blender/editors/space_view3d/view3d_edit.c
source/blender/editors/uvedit/uvedit_parametrizer.c
source/blender/editors/uvedit/uvedit_smart_stitch.c
source/blender/makesrna/intern/rna_nodetree.c
source/blender/modifiers/intern/MOD_array.c
source/blender/modifiers/intern/MOD_ocean.c
source/blender/nodes/composite/node_composite_tree.c
source/blender/nodes/shader/nodes/node_shader_vectTransform.c
source/blender/windowmanager/intern/wm_operators.c
source/blender/windowmanager/intern/wm_playanim.c
source/gameengine/GamePlayer/ghost/GPG_Application.cpp
source/gameengine/SceneGraph/SG_BBox.cpp

index fcc92b641fd4b8258059999d24f907107b218eb0..c26ff7e7306ae5900a10667d4a449c795a74898f 100644 (file)
@@ -2473,9 +2473,9 @@ ParticleInfoNode::ParticleInfoNode()
        add_output("Age", SHADER_SOCKET_FLOAT);
        add_output("Lifetime", SHADER_SOCKET_FLOAT);
        add_output("Location", SHADER_SOCKET_POINT);
-       #if 0   /* not yet supported */
+#if 0  /* not yet supported */
        add_output("Rotation", SHADER_SOCKET_QUATERNION);
-       #endif
+#endif
        add_output("Size", SHADER_SOCKET_FLOAT);
        add_output("Velocity", SHADER_SOCKET_VECTOR);
        add_output("Angular Velocity", SHADER_SOCKET_VECTOR);
@@ -2491,10 +2491,10 @@ void ParticleInfoNode::attributes(AttributeRequestSet *attributes)
                attributes->add(ATTR_STD_PARTICLE);
        if(!output("Location")->links.empty())
                attributes->add(ATTR_STD_PARTICLE);
-       #if 0   /* not yet supported */
+#if 0  /* not yet supported */
        if(!output("Rotation")->links.empty())
                attributes->add(ATTR_STD_PARTICLE);
-       #endif
+#endif
        if(!output("Size")->links.empty())
                attributes->add(ATTR_STD_PARTICLE);
        if(!output("Velocity")->links.empty())
index 7830f42cbb7c2968ad6a9cc2ce3440a0fe377805..f63a93eebb8d05fcdf9c5136b489871199ef798b 100644 (file)
@@ -241,12 +241,12 @@ setCurrentDisplaySetting(
                }
 
                if (best_fit != -1) {
-       #  ifdef _DEBUG
+#  ifdef _DEBUG
                        printf("Switching to video mode %dx%d %dx%d %d\n",
                               vidmodes[best_fit]->hdisplay, vidmodes[best_fit]->vdisplay,
                               vidmodes[best_fit]->htotal, vidmodes[best_fit]->vtotal,
                               calculate_rate(vidmodes[best_fit]));
-       #  endif
+#  endif
 
                        /* change to the mode */
                        XF86VidModeSwitchToMode(dpy, scrnum, vidmodes[best_fit]);
index 6709956e2ddf624e7b7faa8e52832d3900a58e6d..78e5257be1fcda71eba925aa1e6b2be1a9c3c511 100644 (file)
@@ -468,7 +468,7 @@ bool Application::processEvent(GHOST_IEvent *event)
                std::cout << "GHOST_kEventCursorButton"; break;
        case GHOST_kEventCursorMove:
                std::cout << "GHOST_kEventCursorMove"; break;
- #endif
+#endif
                case GHOST_kEventWheel:
                {
                        GHOST_TEventWheelData *wheelData = (GHOST_TEventWheelData *) event->getData();
index 62aa2da2517408d9654ae3595786170dc10d516f..822e5fbc44eeeece3834117656764b381fa824b3 100644 (file)
@@ -429,9 +429,9 @@ typedef struct {
 static const int g_iCells = 2048;
 
 #ifdef _MSC_VER
-       #define NOINLINE __declspec(noinline)
+#  define NOINLINE __declspec(noinline)
 #else
-       #define NOINLINE __attribute__ ((noinline))
+#  define NOINLINE __attribute__ ((noinline))
 #endif
 
 // it is IMPORTANT that this function is called to evaluate the hash since
index ffb92788d4dcb4137bec9c408f95d7157732ee6e..560bebd280bdfffbfc131d5079bc5aa6ebd0b615 100644 (file)
@@ -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;
index e95847b9de4f53b32100eb36f7ef90006fc452c5..d9447e51aa3fddc407a6ebfefbcceec4c6580be1 100644 (file)
@@ -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) {
index fe9a96d60cf65eadca22be492e93886297cf7c11..e2b752ea352e0d32bafe1fede7c55657de74f1ec 100644 (file)
@@ -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) {
index 38301d51cbd6605b7a2c6a20d786daa2923df6fb..ce42d6abc3375b27c5d0c7a75cec90f7ecd5f6e9 100644 (file)
@@ -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++;
                                                }
index 81708133bf309462969140f3f0a9eaf30f86c798..722ea536ed22e416eab3c7a2b049b110f305c952 100644 (file)
@@ -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];
index 85354e4e0d764802133b27a0120604fa7f0f6739..d0ce56332a7daee670e55eecd067b8012c8066c5 100644 (file)
@@ -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) */
index 41217110cd808e36d1ce9b8bb925a386a8c22cbb..0f5707f9a60c8bfd24cabf8dd00cf6d6fbdc8065 100644 (file)
@@ -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))
index 061a54da96f133833637b25c49828b9af13cb889..27e52614a404b8e0402758a80a906f8c2f00e7e9 100644 (file)
@@ -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;
 
index 0a7c6d901af0e6c0d767a6e3a299e34400583c9b..296f931e2fb251c2d1da40176693dd90cafd8837 100644 (file)
@@ -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);
index b39f31bd1ec426ab0b1e0e2dc73a8db04a5116df..bd9d20333e51da2b4604a5c6e374a0fc5b96c2b3 100644 (file)
@@ -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;
index 355922d157a58861cf4957ce08bd8d23326aa050..e07d84a99cece561704e97bf7f950ed14af63bfb 100644 (file)
@@ -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++) {
index a753975ef7c4e03065d70a35a13e4f65ca8b6dc5..422440d8b09c02337a671b30096440164e924627 100644 (file)
@@ -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
index e40527b1bb68b0531f70ec6331eda46a70a0e0ae..c0d09b2d33c3222fee0bae1309b58c2857c2569c 100644 (file)
@@ -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;
index 5acf6319d2f484ced6a8514e7538128273ba505c..d63b72bc4c114714b93bc028fdf0032ff1df26fa 100644 (file)
@@ -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
        }
 
 
index f9cde79c07f6a53c452ee74613e37e32283db1d1..521e3c6231eabe11f7f84415983f803ddd3fda16 100644 (file)
@@ -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"
 }
 
 /**
index 78bba1e307407ee40327100d3c406f54e9931e38..71c5f85941870c78a1766c8f0ebfbc2b487f0fc0 100644 (file)
@@ -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"
index d595afe6a78ca059777803237f475596c48f3fc6..5571a1863331737ad00accb412420769e96b3922 100644 (file)
@@ -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)
index 12b4da6c8b35ff12918087367c705993591f72fb..c8d53b405a076dfd7d811a0b64c69a8ffc0da0a8 100644 (file)
@@ -26,7 +26,7 @@
 #include "DNA_node_types.h"
 #include "DNA_image_types.h"
 extern "C" {
-       #include "RE_engine.h"
+#  include "RE_engine.h"
 }
 
 /**
index cd1f79235ea54808ced78b4378d91744e6f10466..59d889d0c84fdfa13fe7da204be47554be9a9bf6 100644 (file)
@@ -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)
index 8d549d0936228766e8ba66594e4cd22d10e86965..65ff443b55bf18bd22261a666651dbe598347f85 100644 (file)
@@ -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)
index 10dd72ec7bf656c3ccf9509c8872653ac67e3c14..041fa9f7c4c80ce243005bb896d830c82ae40e1b 100644 (file)
 #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)
index de12fff359121e1e51acf2f210e23678a25b843b..5155b55a2ec397e29ce0f6ed8d3cb17aa9366076 100644 (file)
@@ -27,7 +27,7 @@
 #include "COM_SetColorOperation.h"
 
 extern "C" {
-       #include "BLI_listbase.h"
+#  include "BLI_listbase.h"
 }
 
 MuteNode::MuteNode(bNode *editorNode) : Node(editorNode)
index 2e5250e625eb2da319f0c083b2dbf8b09e29ba74..7b0f1c2c298457c0108ea779df8c7ba3669d12d9 100644 (file)
@@ -28,7 +28,7 @@
 #include "COM_Node.h"
 
 extern "C" {
-       #include "BKE_node.h"
+#  include "BKE_node.h"
 }
 
 /**
index d6434c26c7d7dde08bd501b1fb34cb99805caa96..f52c696b772c8adf4eefb7f87a2e8b0e922591fb 100644 (file)
@@ -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)
index cf173cd19f967b02bcbfe5174cc82b66aa3f5d6c..3c37f4474dd0bd0d4beddd150c729c04efe246fc 100644 (file)
@@ -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"
 }
 
 /**
index a579503a829147e0b75ca7124a6dda96a41b9319..8f17c4d93458af72ddd7eb6ec0619276a80233fe 100644 (file)
@@ -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)
index 00ca797bd9bfb9b8821cf195131f6002d1592f05..83f99a16d9f43d0576b6012f5697214e7aa6584c 100644 (file)
@@ -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"
 
index c5474e0ce70d9840cbc32c4f904ae73f82d531b3..bb8cecc60adae9965a6c921757b1ef7e6d63453c 100644 (file)
@@ -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)
index 867053bf1d29ec8b48015cbcdab817ca6080e60e..995c61589cc38dda654e7437e96e0d913f3a6299 100644 (file)
@@ -27,7 +27,7 @@
 #include "MEM_guardedalloc.h"
 
 extern "C" {
-       #include "RE_render_ext.h"
+#  include "RE_render_ext.h"
 }
 
 
index 5f5eca963785f9365ec1e20a8d924ed29140a07a..2527f13c3edc7160d0025c53ca9267587c545c97 100644 (file)
@@ -24,7 +24,7 @@
 #include "BLI_math.h"
 
 extern "C" {
-       #include "RE_pipeline.h"
+#  include "RE_pipeline.h"
 }
 
 BilateralBlurOperation::BilateralBlurOperation() : NodeOperation()
index dfff2bfeafbf0765b90319d4494bee468d70bebf..c8d53b6992d950f6ba91cb76d08872a729345e42 100644 (file)
@@ -25,7 +25,7 @@
 #include "MEM_guardedalloc.h"
 
 extern "C" {
-       #include "RE_pipeline.h"
+#  include "RE_pipeline.h"
 }
 
 BlurBaseOperation::BlurBaseOperation(DataType data_type) : NodeOperation()
index 7f17db1d31bca11a85fc1f661a43b51c77232ce5..f5bca5371e6024dc0aa2d83842f7e0fcc94a1d72 100644 (file)
@@ -25,7 +25,7 @@
 #include "COM_OpenCLDevice.h"
 
 extern "C" {
-       #include "RE_pipeline.h"
+#  include "RE_pipeline.h"
 }
 
 BokehBlurOperation::BokehBlurOperation() : NodeOperation()
index 1115b2ab23949e790aed7471aa18ffa8131bcb89..19deb2f2ba05141b723c7fab19713daafb3a1cb1 100644 (file)
@@ -25,7 +25,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-       #include "BKE_colortools.h"
+#  include "BKE_colortools.h"
 #ifdef __cplusplus
 }
 #include "MEM_guardedalloc.h"
index fd3380d594e608c11726316ed638d50629837225..84d36034ec6dd8dc2b5c47358bd9b677f558bdcc 100644 (file)
@@ -25,7 +25,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-       #include "BKE_texture.h"
+#  include "BKE_texture.h"
 #ifdef __cplusplus
 }
 #endif
index 3d4b771fecc172ca4c4d277bdec4b306606c265c..d4629a8d527f1cd92d350f9e513303f321e36bc6 100644 (file)
 #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"
 
index cb269b16bf478ee36a3fd77b4c962a9dbccd37c6..b99940a88623899c4b631a1fc8ea84063a9f99db 100644 (file)
@@ -23,7 +23,7 @@
 #include "COM_ConvertColorProfileOperation.h"
 
 extern "C" {
-       #include "IMB_imbuf.h"
+#  include "IMB_imbuf.h"
 }
 ConvertColorProfileOperation::ConvertColorProfileOperation() : NodeOperation()
 {
index 36c4985988011ded103f47ecca8e53169f5aafcc..408395bfcf0397df7779c1d16a65ad7b5ebbaab3 100644 (file)
@@ -25,7 +25,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-       #include "BKE_colortools.h"
+#  include "BKE_colortools.h"
 #ifdef __cplusplus
 }
 #endif
index d6c25574d0151a58b4d7b38cc70390b521b646c1..0cea2a7183fa93ae8f33838972f47d2b2199e78e 100644 (file)
@@ -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()
index 2fdfd392d5d947b98f2ffee32d7dc9ff94d18e8e..400c6b5e3b191cce237f46ae300419c602378194 100644 (file)
@@ -26,7 +26,7 @@
 #include "MEM_guardedalloc.h"
 
 extern "C" {
-       #include "RE_pipeline.h"
+#  include "RE_pipeline.h"
 }
 
 GaussianAlphaXBlurOperation::GaussianAlphaXBlurOperation() : BlurBaseOperation(COM_DT_VALUE)
index e8b5eec581e6a0de793224549ac34372ba18543a..4866fb9b4289805cb776398c20df5dcc425aadb1 100644 (file)
@@ -26,7 +26,7 @@
 #include "MEM_guardedalloc.h"
 
 extern "C" {
-       #include "RE_pipeline.h"
+#  include "RE_pipeline.h"
 }
 
 GaussianAlphaYBlurOperation::GaussianAlphaYBlurOperation() : BlurBaseOperation(COM_DT_VALUE)
index c236c73e50f81df0dd61baab120db51db764519c..41d1fe65b11e7a3734422d6834d3e0e20c6177ab 100644 (file)
@@ -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)
index 93cfa4bcf93bbd6977b4c186c63a8a91ec0713b6..648ca0965c8e1768a8d4a9aa542fd75662b10a9e 100644 (file)
@@ -25,7 +25,7 @@
 #include "MEM_guardedalloc.h"
 
 extern "C" {
-       #include "RE_pipeline.h"
+#  include "RE_pipeline.h"
 }
 
 GaussianXBlurOperation::GaussianXBlurOperation() : BlurBaseOperation(COM_DT_COLOR)
index 118de6bb8464634546adc963121523cad1749344..f58e3a2b4f285ff89c0e8c297f8911549a480b2c 100644 (file)
@@ -25,7 +25,7 @@
 #include "MEM_guardedalloc.h"
 
 extern "C" {
-       #include "RE_pipeline.h"
+#  include "RE_pipeline.h"
 }
 
 GaussianYBlurOperation::GaussianYBlurOperation() : BlurBaseOperation(COM_DT_COLOR)
index 592ad114113df9dcfbab2d6f4b2ef22144ccb104..f656b7f489214b84a10273b1949e160235a449a9 100644 (file)
@@ -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--;
                }
        }
index 6bbaac8e30399a8c100f0308fb8787b7049ba28e..2cdf0170fbd39059ca3873784ae14c9d3266d802 100644 (file)
@@ -27,7 +27,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-       #include "BKE_colortools.h"
+#  include "BKE_colortools.h"
 #ifdef __cplusplus
 }
 #endif
index 353d6e8f6ceaba3a707bb57a400c7e43899ebfc9..2733c483146c518b729f8b8884266079a4b69fbf 100644 (file)
 #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()
index a9e2ed9ff64c0a4a5a19e7da1dd9037a73d74a90..206f1509f60260bfd99eddffde3d4606ba975e65 100644 (file)
 #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"
 }
 
 /**
index 201dc99eb9e2d3250c675d6e598b037333257c3c..0a1587c6ffa0adcc58bd7f671282701dced3aef1 100644 (file)
 #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()
index fa22ba668b9c1cbc418567d38ac7b62cdc0b2111..10cf48e57f45132a8d4b3e512cd320980a5d32ad 100644 (file)
@@ -35,7 +35,7 @@
 #include "BLI_string.h"
 
 extern "C" {
-       #include "BLI_voronoi.h"
+#  include "BLI_voronoi.h"
 }
 
 /**
index a5b1987d4b371766fc02b8104aeadc94e073e3e9..7ee2c1119326024ae6f8a77bf081c38854fa6375 100644 (file)
@@ -29,7 +29,7 @@
 #include "BLI_math.h"
 
 extern "C" {
-       #include "BKE_mask.h"
+#  include "BKE_mask.h"
 }
 
 MaskOperation::MaskOperation() : NodeOperation()
index 9781cb4e162f1b0a271f107defbaa80843eed7e3..125de842892aa5c052fdbdb79df1c05f4a53bd28 100644 (file)
@@ -23,7 +23,7 @@
 #include "COM_MixOperation.h"
 
 extern "C" {
-       #include "BLI_math.h"
+#  include "BLI_math.h"
 }
 
 /* ******** Mix Base Operation ******** */
index fbbfa8fd65ea4b8eb888fbb0bfbc2d65c150d2ae..447ca1bb4f652366dc9e88b3fdb284dbf4f22381 100644 (file)
@@ -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()
 {
index dcb5ca066620b0156372f12c722818b15f7ef83b..9a184ae12165d26d28a9d201315e6f81ecbdfbc0 100644 (file)
@@ -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"
 
index bc792244dcbe889b93fc3425d3fa659475fbf738..28b1fc11a7c98661eb61214ae899c429e18f3555 100644 (file)
@@ -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"
 }
 
 
index 42c4a84f9b25b2e9b1f7ffadeaec76d47bf830c7..a1dd08d86245d19521534a7c0271576e1dad0a86 100644 (file)
@@ -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
index ffa319f20a82a95c3bc71c23f847585488921f9a..23fba5a79992b36c0a94fc735d64924a3fdc9a49 100644 (file)
@@ -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()
index c94387337c3dcc2774b21ba034515b1cd83eb257..094b2c4268a10166b9bb9e3642894ee5c011b5ac 100644 (file)
 #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)
index 51e803f696b8dd0e4cf4b1bb56fbc7d9707aa4e6..5deb7b99bce04faf16d54b2b4e4b0e5049fb4c66 100644 (file)
@@ -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()
index 58fa4bd08dcd68340d9728b5b147e66758d2a99f..e43f6ab05b31cfdb25d5d9d3c26c3d8286baa2ac 100644 (file)
 #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()
index 7780023c465ce53f535d89e71d3e815354497489..6579276fa9f809c86e475daab04d51f83872ddfc 100644 (file)
 #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])
index add9e8b959e3f1250dbe430df212e3b9c0dd1449..2ea18f64aab16cfadc506299d8cab2731d14c67a 100644 (file)
 #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"
 }
 
 
index f72af2780d7b00b2816c6095ec576f9c6064402b..e7cda208319aafd15be6b8e611b59aaf304a43d2 100644 (file)
@@ -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 ******** */
index b76a8621b19eab83c94423f6f2a0b5e307783d85..554e27eb5794ff921e0961648f28924d71c5d685 100644 (file)
 #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"
 }
 
 /**
index 5d2977d361b3e573784612f868d735a375cc499b..29c104d0b550e1ee7ea61ff9fc3b0ecc9e30ac7f 100644 (file)
@@ -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()
index 210095f3bf1da513e85f071b3edd359e7ee75275..9278f1c3ec4178148eb100e4b9cfe74c7878bc86 100644 (file)
@@ -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"
 }
 
 
index 064e63c025aaf2c806e5cea2e725f7029bf6fa8e..114cee00530ece57489455d3817ab4c58b1467d3 100644 (file)
 #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"
 }
 
 /**
index 721b17bcff0107e61fe933b642fb9b58731397eb..a76e0866d0d5bc0befe72debf1bfaa0b9391f035 100644 (file)
@@ -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()
index 8bdaa0f486ee4227dcb28aff11ec3288c9228173..4b81001fdab1140192b5b490e3a0b9823b3ee22d 100644 (file)
@@ -25,7 +25,7 @@
 #include "COM_OpenCLDevice.h"
 
 extern "C" {
-       #include "RE_pipeline.h"
+#  include "RE_pipeline.h"
 }
 
 VariableSizeBokehBlurOperation::VariableSizeBokehBlurOperation() : NodeOperation()
index 08ef1249a6a22002be992945a96e703ee2bc193b..f5890157440178a2a3a32b0b91c215c418a6523a 100644 (file)
@@ -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()
index 204b0f2011b9516ba9c2bf6ea52d97e041435141..fedc8c6db7dab22bbee2e3d24f3da55118d2fe26 100644 (file)
@@ -25,7 +25,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-       #include "BKE_colortools.h"
+#  include "BKE_colortools.h"
 #ifdef __cplusplus
 }
 #endif
index 8997f7bb436e8b8bd52f3defada5b3ebc976d230..aa0806944db2631d7da9cb86b501d18e6940d2a8 100644 (file)
 #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"
 }
 
 
index 338ee646b03db9d62c335089a7a4c77f7706f35a..57bf6978174f63f93bb1add147223b4f571daa89 100644 (file)
@@ -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:
index 71717284d8e1173174413f533f20944d47d358f7..656690626670a11eb862193b4c24a904860bfa54 100644 (file)
@@ -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;
index 3a09f531d44e8d788e1ea4bf77d41e6d523560a8..d521de545768fbc2d5ed08b9cabb7ab53efe40a4 100644 (file)
@@ -1789,7 +1789,7 @@ int filterSmartReebGraph(ReebGraph *UNUSED(rg), float UNUSED(threshold))
                arc = nextArc;
        }
        
-       #endif
+#endif
        
        return value;
 }
index f44595d6af663ec7766b436aee7cbdf84f4a2dc2..9ea1d1473280e9313441ba71991c609b3be85ea4 100644 (file)
@@ -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);
index 102bad26e2856e65d9dab822fe1a328a7e3d0d53..64175c133eafea66cf9fffb42e8f11c8c094c076 100644 (file)
@@ -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])
index 8f4454eb2da828f6bb7a7d4282d8d93957be6c7d..78af1bea8bc3d10df985b2526ab802abf3f4d38e 100644 (file)
@@ -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;
index a116cb59de8e38d5ac4a7344ffd983d4b88976f4..1b6f3509b88818971db92ba535a415ba38e3c016 100644 (file)
@@ -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;
index 884a09a56e3efecb7f2735828ea93061d79c9706..0507cfcf37d44f93772a5931ad8e0b81c69b0eb7 100644 (file)
@@ -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;
index e011e0f3c77bbd7bb3590dded26e6484bcf3c5a2..6fa5c8fbf5aa17cd662e53a6c653c24292753aaa 100644 (file)
@@ -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
index 3d5f6a6ce7e0e10553f5cb1f6403a64eea382f32..76305aaabaa51773ca960f3be30c4728c2446563 100644 (file)
@@ -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];
 
index 79b50f2d3ae396042ce10c2905e5ef02d1bb7814..9199c6de3437645c21a43e35760bccd781563276 100644 (file)
@@ -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++) {
index 902a9976f4803f47ecb751fc6c8c860b8736d981..82e85e3a449ebc19ff6b6650da99eaa3f13772d4 100644 (file)
@@ -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);
        }
index eb4493a9d1abfaee1509eb1a3ec5288862c298e0..32e21a0fbbe5a2f1d6ecea0825cb634f98307f16 100644 (file)
@@ -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 */
index 36c6df75461913014198f10d209fe437a558869b..ab9a222b96a062f30a6c44f4eff052ffbb8378ea 100644 (file)
@@ -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) {
index e5c3510db4b74ee2452c93dc7f78f3f18441e4dc..34c44185026e2ced0dc2a3066c0eceb0ec54a40d 100644 (file)
 /* 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,
index 6074745066115d519fd3e4f5c4afec8d1baa256d..c931c843a2340ccced443b7b743327f44ffa9089 100644 (file)
@@ -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];
        }
index 55989bd985c632cee3fbf1df99ae5b38051ec733..38d7f051b0b3620ee649ca80b6ff6ce375e1a30a 100644 (file)
@@ -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.
index 2bf7bb5f672df9f23f1c4f2b87cf175364d0aca3..971b3f0cd14c62c20f3c41138630ca92e1530a52 100644 (file)
@@ -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
index 40a4d5e0986cd7a8cbdc99d01140d7244ce52147..e5d9a9dae0ed46de88f61a735a605811617015fe 100644 (file)
@@ -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;
index d05a5da5f1c8667a76c727f65f96b4bb487635db..895d57c74f2aef7941fc43e93c652fe5c67f4ae8 100644 (file)
@@ -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
        }
 
 }
index 40c70b9e23d217bab3c05af36392894fe99c6396..4cab9d3ca97870b8060f8a9739e9257de96daa37 100644 (file)
@@ -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[] = {
index f17dc29aeeeeaa88b1d19c04d565e6df3ca68ec2..120f7562f0f65d8563bc55ed5a798421cc79dd81 100644 (file)
@@ -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);
index 8456be3d5c4bcc990316a8e4e0f8ee4682e2d5de..af73ccc55bb05b8eae6e6f093c13b97537ddd0ed 100644 (file)
@@ -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
 
        {
index d51d0bf5c1034f081923274778dd644314e9cf30..ac96ca097adcda32771b152b0d2eb28d98ded731 100644 (file)
@@ -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"
index 3911babd2b5db2a0261c207db06017a7b8e83f95..0ecf6284a1410beeb08af2cbba6b78f5dc10f9ae 100644 (file)
@@ -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),