[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [52965] trunk/blender: disable openmp thread assert, would fail in cases where the caller was locking for its self (sculpt mode )

[Campbell Barton]

Revision: 52965
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52965
Author:   campbellbarton
Date:     2012-12-13 10:37:04 +0000 (Thu, 13 Dec 2012)
Log Message:
-----------
disable openmp thread assert, would fail in cases where the caller was locking for its self (sculpt mode)

Modified Paths:
--------------
    trunk/blender/intern/guardedalloc/intern/mallocn.c
    trunk/blender/source/blender/editors/space_view3d/view3d_draw.c

Modified: trunk/blender/intern/guardedalloc/intern/mallocn.c
===================================================================
--- trunk/blender/intern/guardedalloc/intern/mallocn.c	2012-12-13 10:29:31 UTC (rev 52964)
+++ trunk/blender/intern/guardedalloc/intern/mallocn.c	2012-12-13 10:37:04 UTC (rev 52965)
@@ -113,11 +113,14 @@
 /* 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;

Modified: trunk/blender/source/blender/editors/space_view3d/view3d_draw.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_draw.c	2012-12-13 10:29:31 UTC (rev 52964)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_draw.c	2012-12-13 10:37:04 UTC (rev 52965)
@@ -589,9 +589,9 @@
 
 	/* 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);