[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60534] trunk/blender/source: set mempool debug in the game-engine-player too.

Campbell Barton ideasman42 at gmail.com
Thu Oct 3 18:34:00 CEST 2013


Revision: 60534
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60534
Author:   campbellbarton
Date:     2013-10-03 16:34:00 +0000 (Thu, 03 Oct 2013)
Log Message:
-----------
set mempool debug in the game-engine-player too. also remove redundant mempool includes.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/movieclip.c
    trunk/blender/source/blender/bmesh/tools/bmesh_bisect_plane.c
    trunk/blender/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp

Modified: trunk/blender/source/blender/blenkernel/intern/movieclip.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/movieclip.c	2013-10-03 16:12:02 UTC (rev 60533)
+++ trunk/blender/source/blender/blenkernel/intern/movieclip.c	2013-10-03 16:34:00 UTC (rev 60534)
@@ -62,7 +62,6 @@
 #include "BLI_blenlib.h"
 #include "BLI_ghash.h"
 #include "BLI_math.h"
-#include "BLI_mempool.h"
 #include "BLI_threads.h"
 
 #include "BKE_animsys.h"

Modified: trunk/blender/source/blender/bmesh/tools/bmesh_bisect_plane.c
===================================================================
--- trunk/blender/source/blender/bmesh/tools/bmesh_bisect_plane.c	2013-10-03 16:12:02 UTC (rev 60533)
+++ trunk/blender/source/blender/bmesh/tools/bmesh_bisect_plane.c	2013-10-03 16:34:00 UTC (rev 60534)
@@ -39,7 +39,6 @@
 
 #include "BLI_utildefines.h"
 #include "BLI_alloca.h"
-#include "BLI_mempool.h"
 #include "BLI_linklist.h"
 #include "BLI_linklist_stack.h"
 #include "BLI_math.h"

Modified: trunk/blender/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
===================================================================
--- trunk/blender/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp	2013-10-03 16:12:02 UTC (rev 60533)
+++ trunk/blender/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp	2013-10-03 16:34:00 UTC (rev 60534)
@@ -58,11 +58,15 @@
 #endif  // __cplusplus
 #include "MEM_guardedalloc.h"
 #include "BLI_threads.h"
+#include "BLI_mempool.h"
 #include "BLI_blenlib.h"
+
 #include "DNA_scene_types.h"
 #include "DNA_userdef_types.h"
+
 #include "BLO_readfile.h"
 #include "BLO_runtime.h"
+
 #include "BKE_blender.h"
 #include "BKE_depsgraph.h"
 #include "BKE_global.h"
@@ -74,6 +78,7 @@
 #include "BKE_modifier.h"
 #include "BKE_text.h"
 #include "BKE_sound.h"
+
 #include "IMB_imbuf.h"
 	
 	int GHOST_HACK_getFirstFile(char buf[]);
@@ -580,8 +585,11 @@
 
 			case 'd':
 				i++;
-				G.debug |= G_DEBUG;     /* std output printf's */
+				G.debug |= G_DEBUG;
 				MEM_set_memory_debug();
+#ifdef DEBUG
+				BLI_mempool_set_memory_debug();
+#endif
 				break;
 
 			case 'f':




More information about the Bf-blender-cvs mailing list