diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-04-06 17:24:34 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-04-06 17:24:34 +0400 |
| commit | acfc0ea5111bcab5ea5795187d08b2f6ec5addaa (patch) | |
| tree | d9fb7e477ac551859ca95c1f0482eca8b3af1077 /source/blender/blenkernel | |
| parent | 72d0cc1f6123900f5593cd0fe428568f5aa7f682 (diff) | |
| parent | 2ed2226ee753cc6a7a19806d99772efa61af897f (diff) | |
svn merge ^/trunk/blender -r55815:55840
Diffstat (limited to 'source/blender/blenkernel')
| -rw-r--r-- | source/blender/blenkernel/intern/CCGSubSurf.c | 8 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/collision.c | 7 |
2 files changed, 7 insertions, 8 deletions
diff --git a/source/blender/blenkernel/intern/CCGSubSurf.c b/source/blender/blenkernel/intern/CCGSubSurf.c index e58d484b0c0..292d74b03d7 100644 --- a/source/blender/blenkernel/intern/CCGSubSurf.c +++ b/source/blender/blenkernel/intern/CCGSubSurf.c @@ -7,15 +7,15 @@ #include <string.h> #include <math.h> -#include "BKE_ccg.h" -#include "CCGSubSurf.h" -#include "BKE_subsurf.h" - #include "MEM_guardedalloc.h" #include "BLO_sys_types.h" // for intptr_t support #include "BLI_utildefines.h" /* for BLI_assert */ +#include "BKE_ccg.h" +#include "CCGSubSurf.h" +#include "BKE_subsurf.h" + /* used for normalize_v3 in BLI_math_vector * float.h's FLT_EPSILON causes trouble with subsurf normals - campbell */ #define EPSILON (1.0e-35f) diff --git a/source/blender/blenkernel/intern/collision.c b/source/blender/blenkernel/intern/collision.c index ed72a0fb37b..4bfe3b1c0bd 100644 --- a/source/blender/blenkernel/intern/collision.c +++ b/source/blender/blenkernel/intern/collision.c @@ -32,8 +32,6 @@ #include "MEM_guardedalloc.h" -#include "BKE_cloth.h" - #include "DNA_cloth_types.h" #include "DNA_group_types.h" #include "DNA_mesh_types.h" @@ -52,11 +50,12 @@ #include "BLI_rand.h" #include "BKE_DerivedMesh.h" +#include "BKE_cloth.h" #include "BKE_global.h" -#include "BKE_scene.h" #include "BKE_mesh.h" -#include "BKE_object.h" #include "BKE_modifier.h" +#include "BKE_object.h" +#include "BKE_scene.h" #include "BKE_DerivedMesh.h" #ifdef WITH_BULLET |