diff options
| -rw-r--r-- | intern/guardedalloc/intern/mallocn.c | 3 | ||||
| -rw-r--r-- | source/blender/editors/space_view3d/view3d_draw.c | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/intern/guardedalloc/intern/mallocn.c b/intern/guardedalloc/intern/mallocn.c index 59e780f21e5..d747f042cbc 100644 --- a/intern/guardedalloc/intern/mallocn.c +++ b/intern/guardedalloc/intern/mallocn.c @@ -113,11 +113,14 @@ typedef struct MemHead { /* for openmp threading asserts, saves time troubleshooting * we may need to extend this if blender code starts using MEM_ * functions inside OpenMP correctly with omp_set_lock() */ + +#if 0 /* disable for now, only use to debug openmp code which doesn lock threads for malloc */ #if defined(_OPENMP) && defined(DEBUG) # include <assert.h> # include <omp.h> # define DEBUG_OMP_MALLOC #endif +#endif typedef struct MemTail { int tag3, pad; diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c index c9387bd776d..2f09354439b 100644 --- a/source/blender/editors/space_view3d/view3d_draw.c +++ b/source/blender/editors/space_view3d/view3d_draw.c @@ -589,9 +589,9 @@ static void drawcursor(Scene *scene, ARegion *ar, View3D *v3d) /* we don't want the clipping for cursor */ if (ED_view3d_project_int_global(ar, give_cursor(scene, v3d), co, V3D_PROJ_TEST_NOP) == V3D_PROJ_RET_OK) { - float f5 = 0.25f * U.widget_unit; - float f10 = 0.5f * U.widget_unit; - float f20 = U.widget_unit; + const float f5 = 0.25f * U.widget_unit; + const float f10 = 0.5f * U.widget_unit; + const float f20 = U.widget_unit; setlinestyle(0); cpack(0xFF); |