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/makesrna/intern/rna_pose.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/makesrna/intern/rna_pose.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_pose.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/source/blender/makesrna/intern/rna_pose.c b/source/blender/makesrna/intern/rna_pose.c index 37b453ad7a4..eeb223ed54a 100644 --- a/source/blender/makesrna/intern/rna_pose.c +++ b/source/blender/makesrna/intern/rna_pose.c @@ -37,7 +37,6 @@ #include "DNA_scene_types.h" #include "BLI_math.h" -#include "BLI_ghash.h" #include "WM_types.h" @@ -49,6 +48,10 @@ #include "DNA_userdef_types.h" +#include "MEM_guardedalloc.h" + +#include "BLI_ghash.h" + #include "BKE_context.h" #include "BKE_constraint.h" #include "BKE_depsgraph.h" |