diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-08-01 01:26:14 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-08-01 01:26:14 +0400 |
| commit | 33a9cafc3b635c05ca40fef853d5b5282d56ec13 (patch) | |
| tree | 0cff210beae3929a12718c521f195cc54a2cec14 | |
| parent | cdc6793dd887c996f4304da682e8f8064b967d6c (diff) | |
quiet spacenav output on linux for regular builds, ifdef signed int for msvc openmp.
| -rw-r--r-- | intern/ghost/intern/GHOST_NDOFManagerX11.cpp | 3 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/mask_rasterize.c | 6 |
2 files changed, 8 insertions, 1 deletions
diff --git a/intern/ghost/intern/GHOST_NDOFManagerX11.cpp b/intern/ghost/intern/GHOST_NDOFManagerX11.cpp index bd285bc7a27..49e7def8730 100644 --- a/intern/ghost/intern/GHOST_NDOFManagerX11.cpp +++ b/intern/ghost/intern/GHOST_NDOFManagerX11.cpp @@ -58,8 +58,11 @@ GHOST_NDOFManagerX11::GHOST_NDOFManagerX11(GHOST_System& sys) } } else { +#ifdef DEBUG + /* annoying for official builds, just adds noise and most prople don't own these */ puts("ndof: spacenavd not found"); /* This isn't a hard error, just means the user doesn't have a 3D mouse. */ +#endif } } diff --git a/source/blender/blenkernel/intern/mask_rasterize.c b/source/blender/blenkernel/intern/mask_rasterize.c index 17e79262796..b26e6de59c4 100644 --- a/source/blender/blenkernel/intern/mask_rasterize.c +++ b/source/blender/blenkernel/intern/mask_rasterize.c @@ -1301,7 +1301,11 @@ void BKE_maskrasterize_buffer(MaskRasterHandle *mr_handle, const unsigned int width, const unsigned int height, float *buffer) { - int y; +#ifdef _MSC_VER + int y; /* msvc requires signed for some reason */ +#else + unsigned int y; +#endif #pragma omp parallel for private(y) for (y = 0; y < height; y++) { |