diff options
author | Campbell Barton <ideasman42@gmail.com> | 2010-04-12 04:36:50 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2010-04-12 04:36:50 +0400 |
commit | 8c3ab1c2a40c17901546575adda3eba5d76b25ba (patch) | |
tree | ea7c1febdbc344c7173a8f9936156b98e680fa47 /source/blender/modifiers/intern/MOD_shapekey.c | |
parent | 7d9898229582b44a525c5752550a2494adaa4fd6 (diff) |
- use more inline math funcitons where possible
- swapped in less verbose math functons
- modifier include cleanup
Diffstat (limited to 'source/blender/modifiers/intern/MOD_shapekey.c')
-rw-r--r-- | source/blender/modifiers/intern/MOD_shapekey.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/source/blender/modifiers/intern/MOD_shapekey.c b/source/blender/modifiers/intern/MOD_shapekey.c index d7109b48bbe..80a1778c369 100644 --- a/source/blender/modifiers/intern/MOD_shapekey.c +++ b/source/blender/modifiers/intern/MOD_shapekey.c @@ -32,13 +32,12 @@ #include "stddef.h" #include "string.h" -#include "stdarg.h" #include "math.h" #include "float.h" #include "BLI_kdtree.h" #include "BLI_rand.h" -#include "BLI_uvproject.h" +#include "BLI_math.h" #include "MEM_guardedalloc.h" @@ -51,12 +50,9 @@ #include "BKE_action.h" -#include "BKE_bmesh.h" -#include "BKE_cloth.h" #include "BKE_cdderivedmesh.h" #include "BKE_displist.h" #include "BKE_fluidsim.h" -#include "BKE_global.h" #include "BKE_multires.h" #include "BKE_key.h" #include "BKE_lattice.h" @@ -73,13 +69,11 @@ #include "BKE_subsurf.h" #include "BKE_texture.h" -#include "depsgraph_private.h" #include "BKE_deform.h" #include "BKE_shrinkwrap.h" #include "LOD_decimation.h" -#include "CCGSubSurf.h" #include "RE_shader_ext.h" @@ -103,7 +97,7 @@ static void deformVerts( } static void deformVertsEM( - ModifierData *md, Object *ob, EditMesh *editData, + ModifierData *md, Object *ob, struct EditMesh *editData, DerivedMesh *derivedData, float (*vertexCos)[3], int numVerts) { Key *key= ob_get_key(ob); @@ -113,7 +107,7 @@ static void deformVertsEM( } static void deformMatricesEM( - ModifierData *md, Object *ob, EditMesh *editData, + ModifierData *md, Object *ob, struct EditMesh *editData, DerivedMesh *derivedData, float (*vertexCos)[3], float (*defMats)[3][3], int numVerts) { |