Revision: 49433
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49433
Author: campbellbarton
Date: 2012-07-31 21:26:14 +0000 (Tue, 31 Jul 2012)
Log Message:
-----------
quiet spacenav output on linux for regular builds, ifdef signed int for msvc
openmp.
Modified Paths:
--------------
trunk/blender/intern/ghost/intern/GHOST_NDOFManagerX11.cpp
trunk/blender/source/blender/blenkernel/intern/mask_rasterize.c
Modified: trunk/blender/intern/ghost/intern/GHOST_NDOFManagerX11.cpp
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_NDOFManagerX11.cpp 2012-07-31
20:58:48 UTC (rev 49432)
+++ trunk/blender/intern/ghost/intern/GHOST_NDOFManagerX11.cpp 2012-07-31
21:26:14 UTC (rev 49433)
@@ -58,8 +58,11 @@
}
}
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
}
}
Modified: trunk/blender/source/blender/blenkernel/intern/mask_rasterize.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/mask_rasterize.c
2012-07-31 20:58:48 UTC (rev 49432)
+++ trunk/blender/source/blender/blenkernel/intern/mask_rasterize.c
2012-07-31 21:26:14 UTC (rev 49433)
@@ -1301,7 +1301,11 @@
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++) {
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
