diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-12-26 01:31:19 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-12-26 01:31:19 +0400 |
| commit | 2cd5436a81da5c15ac70bd2b80c2f062cce5d02e (patch) | |
| tree | 2cc12476fb3fa653042eef99fa6b5d4d8cb290ec /source/blender/modifiers/intern/MOD_decimate.c | |
| parent | 4ced91da47ec1e95d71beef07b218fd0290ff68a (diff) | |
| parent | 02d72b5c076f4ae1b47da74fe7a60a916edad9f2 (diff) | |
svn merge ^/trunk/blender -r42839:42871
Diffstat (limited to 'source/blender/modifiers/intern/MOD_decimate.c')
| -rw-r--r-- | source/blender/modifiers/intern/MOD_decimate.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/modifiers/intern/MOD_decimate.c b/source/blender/modifiers/intern/MOD_decimate.c index f533e205fe6..dca6d6a8a31 100644 --- a/source/blender/modifiers/intern/MOD_decimate.c +++ b/source/blender/modifiers/intern/MOD_decimate.c @@ -38,13 +38,13 @@ #include "BLI_math.h" #include "BLI_utildefines.h" +#include "MEM_guardedalloc.h" -#include "BKE_cdderivedmesh.h" #include "BKE_mesh.h" #include "BKE_modifier.h" #include "BKE_particle.h" +#include "BKE_cdderivedmesh.h" -#include "MEM_guardedalloc.h" #ifdef WITH_MOD_DECIMATE #include "LOD_decimation.h" |