diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2016-05-21 01:54:37 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2016-05-21 01:54:37 +0300 |
| commit | 2203444f3f3afeab43e4d8aea2f5bad36760b384 (patch) | |
| tree | a15d4f12b68608df52c2c4874cfeeee7bea8f5d3 | |
| parent | a055395487a338ab5e4fe2b749df80cc87da97c5 (diff) | |
Hopefully fix OMP/MSVC crap...
| -rw-r--r-- | source/blender/blenkernel/intern/dynamicpaint.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/source/blender/blenkernel/intern/dynamicpaint.c b/source/blender/blenkernel/intern/dynamicpaint.c index daf1e866e16..8af97505061 100644 --- a/source/blender/blenkernel/intern/dynamicpaint.c +++ b/source/blender/blenkernel/intern/dynamicpaint.c @@ -2261,9 +2261,11 @@ int dynamicPaint_createUVSurface(Scene *scene, DynamicPaintSurface *surface) } /* Loop through every pixel and check if pixel is uv-mapped on a canvas face. */ + int ty; #pragma omp parallel for schedule(static) - for (int ty = 0; ty < h; ty++) { - for (int tx = 0; tx < w; tx++) { + for (ty = 0; ty < h; ty++) { + int tx; + for (tx = 0; tx < w; tx++) { const int index = tx + w * ty; PaintUVPoint *tPoint = &tempPoints[index]; float point[5][2]; @@ -2347,8 +2349,9 @@ int dynamicPaint_createUVSurface(Scene *scene, DynamicPaintSurface *surface) * (To avoid seams on uv island edges) */ #pragma omp parallel for schedule(static) - for (int ty = 0; ty < h; ty++) { - for (int tx = 0; tx < w; tx++) { + for (ty = 0; ty < h; ty++) { + int tx; + for (tx = 0; tx < w; tx++) { const int index = tx + w * ty; PaintUVPoint *tPoint = &tempPoints[index]; @@ -2438,7 +2441,7 @@ int dynamicPaint_createUVSurface(Scene *scene, DynamicPaintSurface *surface) if (sData->adj_data) { PaintAdjData *ed = sData->adj_data; unsigned int n_pos = 0; - for (int ty = 0; ty < h; ty++) { + for (ty = 0; ty < h; ty++) { for (int tx = 0; tx < w; tx++) { const int index = tx + w * ty; |