diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2014-02-17 14:36:47 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2014-02-17 14:37:56 +0400 |
| commit | 1af726a82ef1e302110b296fd0c59c67456e32d6 (patch) | |
| tree | a5efc737aef1291a710b31b9c25d9079df561a3f /source/blender/blenkernel/intern/mask_rasterize.c | |
| parent | 7ee9de29a623cfb2a1efa70eb93e5b18bb8ed144 (diff) | |
Mask: fix for intel openmp which doesn't support casts in for loops
Diffstat (limited to 'source/blender/blenkernel/intern/mask_rasterize.c')
| -rw-r--r-- | source/blender/blenkernel/intern/mask_rasterize.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/mask_rasterize.c b/source/blender/blenkernel/intern/mask_rasterize.c index ba1b873c613..90bda88819f 100644 --- a/source/blender/blenkernel/intern/mask_rasterize.c +++ b/source/blender/blenkernel/intern/mask_rasterize.c @@ -1435,12 +1435,16 @@ void BKE_maskrasterize_buffer(MaskRasterHandle *mr_handle, { #ifdef _MSC_VER int y; /* msvc requires signed for some reason */ + + /* ignore sign mismatch */ +# pragma warning(push) +# pragma warning(disable:4018) #else unsigned int y; #endif #pragma omp parallel for private(y) - for (y = 0; (unsigned int)y < height; y++) { + for (y = 0; y < height; y++) { unsigned int i = y * width; unsigned int x; float xy[2]; @@ -1451,4 +1455,9 @@ void BKE_maskrasterize_buffer(MaskRasterHandle *mr_handle, buffer[i] = BKE_maskrasterize_handle_sample(mr_handle, xy); } } + +#ifdef _MSC_VER +# pragma warning(pop) +#endif + } |