Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2012-05-06 17:38:33 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-05-06 17:38:33 +0400
commit3d8e58751c3801a6ad2e00ed7c35059e827059b2 (patch)
tree9eb8ec613a1dad477b9607a6371b723d0be25650 /source/blender/modifiers/intern/MOD_shapekey.c
parent900c8a91548ab867391aa8d130cd03ff2d0e3d21 (diff)
style cleanup: modifiers
Diffstat (limited to 'source/blender/modifiers/intern/MOD_shapekey.c')
-rw-r--r--source/blender/modifiers/intern/MOD_shapekey.c58
1 files changed, 29 insertions, 29 deletions
diff --git a/source/blender/modifiers/intern/MOD_shapekey.c b/source/blender/modifiers/intern/MOD_shapekey.c
index a91019b0228..0f67eb4dd1a 100644
--- a/source/blender/modifiers/intern/MOD_shapekey.c
+++ b/source/blender/modifiers/intern/MOD_shapekey.c
@@ -49,40 +49,40 @@
#include "MEM_guardedalloc.h"
static void deformVerts(ModifierData *md, Object *ob,
- DerivedMesh *UNUSED(derivedData),
- float (*vertexCos)[3],
- int numVerts,
- int UNUSED(useRenderParams),
- int UNUSED(isFinalCalc))
+ DerivedMesh *UNUSED(derivedData),
+ float (*vertexCos)[3],
+ int numVerts,
+ int UNUSED(useRenderParams),
+ int UNUSED(isFinalCalc))
{
- KeyBlock *kb= ob_get_keyblock(ob);
+ KeyBlock *kb = ob_get_keyblock(ob);
float (*deformedVerts)[3];
if (kb && kb->totelem == numVerts) {
- deformedVerts= (float(*)[3])do_ob_key(md->scene, ob);
+ deformedVerts = (float(*)[3])do_ob_key(md->scene, ob);
if (deformedVerts) {
- memcpy(vertexCos, deformedVerts, sizeof(float)*3*numVerts);
+ memcpy(vertexCos, deformedVerts, sizeof(float) * 3 * numVerts);
MEM_freeN(deformedVerts);
}
}
}
static void deformMatrices(ModifierData *md, Object *ob, DerivedMesh *derivedData,
- float (*vertexCos)[3], float (*defMats)[3][3], int numVerts)
+ float (*vertexCos)[3], float (*defMats)[3][3], int numVerts)
{
- Key *key= ob_get_key(ob);
- KeyBlock *kb= ob_get_keyblock(ob);
+ Key *key = ob_get_key(ob);
+ KeyBlock *kb = ob_get_keyblock(ob);
float scale[3][3];
(void)vertexCos; /* unused */
- if (kb && kb->totelem==numVerts && kb!=key->refkey) {
+ if (kb && kb->totelem == numVerts && kb != key->refkey) {
int a;
if (ob->shapeflag & OB_SHAPE_LOCK) scale_m3_fl(scale, 1);
else scale_m3_fl(scale, kb->curval);
- for (a=0; a<numVerts; a++)
+ for (a = 0; a < numVerts; a++)
copy_m3_m3(defMats[a], scale);
}
@@ -90,35 +90,35 @@ static void deformMatrices(ModifierData *md, Object *ob, DerivedMesh *derivedDat
}
static void deformVertsEM(ModifierData *md, Object *ob,
- struct BMEditMesh *UNUSED(editData),
- DerivedMesh *derivedData,
- float (*vertexCos)[3],
- int numVerts)
+ struct BMEditMesh *UNUSED(editData),
+ DerivedMesh *derivedData,
+ float (*vertexCos)[3],
+ int numVerts)
{
- Key *key= ob_get_key(ob);
+ Key *key = ob_get_key(ob);
if (key && key->type == KEY_RELATIVE)
deformVerts(md, ob, derivedData, vertexCos, numVerts, 0, 0);
}
static void deformMatricesEM(ModifierData *UNUSED(md), Object *ob,
- struct BMEditMesh *UNUSED(editData),
- DerivedMesh *UNUSED(derivedData),
- float (*vertexCos)[3],
- float (*defMats)[3][3],
- int numVerts)
+ struct BMEditMesh *UNUSED(editData),
+ DerivedMesh *UNUSED(derivedData),
+ float (*vertexCos)[3],
+ float (*defMats)[3][3],
+ int numVerts)
{
- Key *key= ob_get_key(ob);
- KeyBlock *kb= ob_get_keyblock(ob);
+ Key *key = ob_get_key(ob);
+ KeyBlock *kb = ob_get_keyblock(ob);
float scale[3][3];
(void)vertexCos; /* unused */
- if (kb && kb->totelem==numVerts && kb!=key->refkey) {
+ if (kb && kb->totelem == numVerts && kb != key->refkey) {
int a;
scale_m3_fl(scale, kb->curval);
- for (a=0; a<numVerts; a++)
+ for (a = 0; a < numVerts; a++)
copy_m3_m3(defMats[a], scale);
}
}
@@ -128,8 +128,8 @@ ModifierTypeInfo modifierType_ShapeKey = {
/* structName */ "ShapeKeyModifierData",
/* structSize */ sizeof(ShapeKeyModifierData),
/* type */ eModifierTypeType_OnlyDeform,
- /* flags */ eModifierTypeFlag_AcceptsCVs
- | eModifierTypeFlag_SupportsEditmode,
+ /* flags */ eModifierTypeFlag_AcceptsCVs |
+ eModifierTypeFlag_SupportsEditmode,
/* copyData */ NULL,
/* deformVerts */ deformVerts,