diff options
author | Joerg Mueller <nexyon@gmail.com> | 2010-08-16 13:37:08 +0400 |
---|---|---|
committer | Joerg Mueller <nexyon@gmail.com> | 2010-08-16 13:37:08 +0400 |
commit | 2b7a774ab0dfd3bc66240b387a586b5122ab2661 (patch) | |
tree | 11b863eb5c0a138dbfbc8b65d42d2724ddc80946 /source/blender/imbuf/intern/cache.c | |
parent | 02314f11d83f4ee7e0b2d3f052d36ac492cfc910 (diff) | |
parent | a91d538f47171a40463016b91c22d39d694d923a (diff) |
svn merge -r 31314:31370 https://svn.blender.org/svnroot/bf-blender/trunk/blendersoc-2010-nexyon
Diffstat (limited to 'source/blender/imbuf/intern/cache.c')
-rw-r--r-- | source/blender/imbuf/intern/cache.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/source/blender/imbuf/intern/cache.c b/source/blender/imbuf/intern/cache.c index d15826df2f0..77e01d8ebef 100644 --- a/source/blender/imbuf/intern/cache.c +++ b/source/blender/imbuf/intern/cache.c @@ -20,6 +20,8 @@ * ***** END GPL LICENSE BLOCK ***** */ +#include "MEM_guardedalloc.h" + #include "BLI_ghash.h" #include "BLI_listbase.h" #include "BLI_memarena.h" |