bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

disable openmp thread assert, would fail in cases where the caller was locking for its self (sculpt mode)

Browse Source
This commit is contained in:
Campbell Barton 2012-12-13 10:37:04 +00:00
parent b83f105588
commit 60808c5ed6
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
intern/guardedalloc/intern/mallocn.c
View File

@ -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;

6
source/blender/editors/space_view3d/view3d_draw.c
View File

@ -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);