diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-10-03 20:34:00 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-10-03 20:34:00 +0400 |
| commit | 43217da6d9c766483b7d2175a785c46f280bb5d6 (patch) | |
| tree | 8589a3783d2da2d98d3a320ea223f652513e8cde | |
| parent | f372d1417369af96687436a7f5979ab12da58133 (diff) | |
set mempool debug in the game-engine-player too. also remove redundant mempool includes.
| -rw-r--r-- | source/blender/blenkernel/intern/movieclip.c | 1 | ||||
| -rw-r--r-- | source/blender/bmesh/tools/bmesh_bisect_plane.c | 1 | ||||
| -rw-r--r-- | source/gameengine/GamePlayer/ghost/GPG_ghost.cpp | 10 |
3 files changed, 9 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/movieclip.c b/source/blender/blenkernel/intern/movieclip.c index bf4a63c52a8..d9630a7343d 100644 --- a/source/blender/blenkernel/intern/movieclip.c +++ b/source/blender/blenkernel/intern/movieclip.c @@ -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" diff --git a/source/blender/bmesh/tools/bmesh_bisect_plane.c b/source/blender/bmesh/tools/bmesh_bisect_plane.c index 3baf8675a0d..e45ee75b8cd 100644 --- a/source/blender/bmesh/tools/bmesh_bisect_plane.c +++ b/source/blender/bmesh/tools/bmesh_bisect_plane.c @@ -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" diff --git a/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp b/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp index 0b1fbf977dd..5bed4fa40b6 100644 --- a/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp +++ b/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp @@ -58,11 +58,15 @@ extern "C" #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 @@ extern "C" #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 @@ int main(int argc, char** argv) 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': |