diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2010-06-06 05:15:44 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2010-06-06 05:15:44 +0400 |
| commit | ed338da8c963cfcc26315584bb694a95f2c89088 (patch) | |
| tree | e21a68328e7d0d1f4d41f95fd27690172bfc0957 /source/gameengine/Ketsji/KX_WorldIpoController.h | |
| parent | 0cc077ec455e701a1d3caa1350051f7d3737763b (diff) | |
- WITH_CXX_GUARDEDALLOC working again
- CMake building without python or fluidsim working again (broke in recent commit)
- remove BLI_short_filename(), it wasnt used anywhere.
Diffstat (limited to 'source/gameengine/Ketsji/KX_WorldIpoController.h')
| -rw-r--r-- | source/gameengine/Ketsji/KX_WorldIpoController.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/gameengine/Ketsji/KX_WorldIpoController.h b/source/gameengine/Ketsji/KX_WorldIpoController.h index c89f893458f..f6c36198ae7 100644 --- a/source/gameengine/Ketsji/KX_WorldIpoController.h +++ b/source/gameengine/Ketsji/KX_WorldIpoController.h @@ -94,7 +94,7 @@ public: #ifdef WITH_CXX_GUARDEDALLOC public: - void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_WorldIpoController"); } + void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_WorldIpoController"); } void operator delete( void *mem ) { MEM_freeN(mem); } #endif }; |