diff options
| author | Joseph Eagar <joeedh@gmail.com> | 2010-09-04 09:31:25 +0400 |
|---|---|---|
| committer | Joseph Eagar <joeedh@gmail.com> | 2010-09-04 09:31:25 +0400 |
| commit | bb7339a7aec37bdb2ee8a21599e6c65b37ef1277 (patch) | |
| tree | 6fb8da94c6e43098c606f768e722484b04b8645c /source/blender/modifiers/intern/MOD_mask.c | |
| parent | 37f2c8a64c3277f100ab084ef1bb3846bc7b2c62 (diff) | |
| parent | 8a320974f1b3e6004db3b3ad64f97742f878cbee (diff) | |
merge with trunk at r31523
Diffstat (limited to 'source/blender/modifiers/intern/MOD_mask.c')
| -rw-r--r-- | source/blender/modifiers/intern/MOD_mask.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/source/blender/modifiers/intern/MOD_mask.c b/source/blender/modifiers/intern/MOD_mask.c index 2505458c4d7..6a62ce645d8 100644 --- a/source/blender/modifiers/intern/MOD_mask.c +++ b/source/blender/modifiers/intern/MOD_mask.c @@ -30,11 +30,14 @@ * */ +#include "MEM_guardedalloc.h" + +#include "BLI_ghash.h" + #include "DNA_armature_types.h" #include "DNA_meshdata_types.h" #include "DNA_modifier_types.h" - -#include "BLI_ghash.h" +#include "DNA_object_types.h" #include "BKE_cdderivedmesh.h" #include "BKE_mesh.h" |